Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b6b4d9b8d07e34f745871d3109c84894db29041b

Authored by Alan Cox
Committed by Wim Van Sebroeck
1 parent 94da1e2eff
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[WATCHDOG 02/57] clean up and check advantech watchdog 

Clean up the advantech watchdog code and inspect for BKL problems

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Showing 1 changed file with 62 additions and 73 deletions Side-by-side Diff

drivers/watchdog/advantechwdt.c
Diff comments   View file @ b6b4d9b
... ... @@ -72,35 +72,35 @@
72 72  
73 73 static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
74 74 module_param(timeout, int, 0);
75   -MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
  75 +MODULE_PARM_DESC(timeout,
  76 + "Watchdog timeout in seconds. 1<= timeout <=63, default="
  77 + __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
76 78  
77 79 static int nowayout = WATCHDOG_NOWAYOUT;
78 80 module_param(nowayout, int, 0);
79   -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
  81 +MODULE_PARM_DESC(nowayout,
  82 + "Watchdog cannot be stopped once started (default="
  83 + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
80 84  
81 85 /*
82 86 * Watchdog Operations
83 87 */
84 88  
85   -static void
86   -advwdt_ping(void)
  89 +static void advwdt_ping(void)
87 90 {
88 91 /* Write a watchdog value */
89 92 outb_p(timeout, wdt_start);
90 93 }
91 94  
92   -static void
93   -advwdt_disable(void)
  95 +static void advwdt_disable(void)
94 96 {
95 97 inb_p(wdt_stop);
96 98 }
97 99  
98   -static int
99   -advwdt_set_heartbeat(int t)
  100 +static int advwdt_set_heartbeat(int t)
100 101 {
101   - if ((t < 1) || (t > 63))
  102 + if (t < 1 || t > 63)
102 103 return -EINVAL;
103   -
104 104 timeout = t;
105 105 return 0;
106 106 }
... ... @@ -109,8 +109,8 @@
109 109 * /dev/watchdog handling
110 110 */
111 111  
112   -static ssize_t
113   -advwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
  112 +static ssize_t advwdt_write(struct file *file, const char __user *buf,
  113 + size_t count, loff_t *ppos)
114 114 {
115 115 if (count) {
116 116 if (!nowayout) {
... ... @@ -131,9 +131,7 @@
131 131 return count;
132 132 }
133 133  
134   -static int
135   -advwdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
136   - unsigned long arg)
  134 +static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
137 135 {
138 136 int new_timeout;
139 137 void __user *argp = (void __user *)arg;
140 138  
141 139  
142 140  
143 141  
144 142  
145 143  
146 144  
147 145  
148 146  
... ... @@ -146,57 +144,50 @@
146 144  
147 145 switch (cmd) {
148 146 case WDIOC_GETSUPPORT:
149   - if (copy_to_user(argp, &ident, sizeof(ident)))
150   - return -EFAULT;
151   - break;
  147 + if (copy_to_user(argp, &ident, sizeof(ident)))
  148 + return -EFAULT;
  149 + break;
152 150  
153 151 case WDIOC_GETSTATUS:
154 152 case WDIOC_GETBOOTSTATUS:
155   - return put_user(0, p);
  153 + return put_user(0, p);
156 154  
157 155 case WDIOC_KEEPALIVE:
158   - advwdt_ping();
159   - break;
  156 + advwdt_ping();
  157 + break;
160 158  
161 159 case WDIOC_SETTIMEOUT:
162   - if (get_user(new_timeout, p))
163   - return -EFAULT;
164   - if (advwdt_set_heartbeat(new_timeout))
165   - return -EINVAL;
166   - advwdt_ping();
167   - /* Fall */
168   -
  160 + if (get_user(new_timeout, p))
  161 + return -EFAULT;
  162 + if (advwdt_set_heartbeat(new_timeout))
  163 + return -EINVAL;
  164 + advwdt_ping();
  165 + /* Fall */
169 166 case WDIOC_GETTIMEOUT:
170   - return put_user(timeout, p);
171   -
  167 + return put_user(timeout, p);
172 168 case WDIOC_SETOPTIONS:
173 169 {
174   - int options, retval = -EINVAL;
  170 + int options, retval = -EINVAL;
175 171  
176   - if (get_user(options, p))
177   - return -EFAULT;
178   -
179   - if (options & WDIOS_DISABLECARD) {
180   - advwdt_disable();
181   - retval = 0;
182   - }
183   -
184   - if (options & WDIOS_ENABLECARD) {
185   - advwdt_ping();
186   - retval = 0;
187   - }
188   -
189   - return retval;
  172 + if (get_user(options, p))
  173 + return -EFAULT;
  174 + if (options & WDIOS_DISABLECARD) {
  175 + advwdt_disable();
  176 + retval = 0;
  177 + }
  178 + if (options & WDIOS_ENABLECARD) {
  179 + advwdt_ping();
  180 + retval = 0;
  181 + }
  182 + return retval;
190 183 }
191   -
192 184 default:
193   - return -ENOTTY;
  185 + return -ENOTTY;
194 186 }
195 187 return 0;
196 188 }
197 189  
198   -static int
199   -advwdt_open(struct inode *inode, struct file *file)
  190 +static int advwdt_open(struct inode *inode, struct file *file)
200 191 {
201 192 if (test_and_set_bit(0, &advwdt_is_open))
202 193 return -EBUSY;
... ... @@ -214,7 +205,8 @@
214 205 if (adv_expect_close == 42) {
215 206 advwdt_disable();
216 207 } else {
217   - printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
  208 + printk(KERN_CRIT PFX
  209 + "Unexpected close, not stopping watchdog!\n");
218 210 advwdt_ping();
219 211 }
220 212 clear_bit(0, &advwdt_is_open);
... ... @@ -230,7 +222,7 @@
230 222 .owner = THIS_MODULE,
231 223 .llseek = no_llseek,
232 224 .write = advwdt_write,
233   - .ioctl = advwdt_ioctl,
  225 + .unlocked_ioctl = advwdt_ioctl,
234 226 .open = advwdt_open,
235 227 .release = advwdt_close,
236 228 };
237 229  
238 230  
... ... @@ -245,23 +237,24 @@
245 237 * Init & exit routines
246 238 */
247 239  
248   -static int __devinit
249   -advwdt_probe(struct platform_device *dev)
  240 +static int __devinit advwdt_probe(struct platform_device *dev)
250 241 {
251 242 int ret;
252 243  
253 244 if (wdt_stop != wdt_start) {
254 245 if (!request_region(wdt_stop, 1, WATCHDOG_NAME)) {
255   - printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
256   - wdt_stop);
  246 + printk(KERN_ERR PFX
  247 + "I/O address 0x%04x already in use\n",
  248 + wdt_stop);
257 249 ret = -EIO;
258 250 goto out;
259 251 }
260 252 }
261 253  
262 254 if (!request_region(wdt_start, 1, WATCHDOG_NAME)) {
263   - printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
264   - wdt_start);
  255 + printk(KERN_ERR PFX
  256 + "I/O address 0x%04x already in use\n",
  257 + wdt_start);
265 258 ret = -EIO;
266 259 goto unreg_stop;
267 260 }
268 261  
269 262  
270 263  
... ... @@ -269,20 +262,19 @@
269 262 /* Check that the heartbeat value is within it's range ; if not reset to the default */
270 263 if (advwdt_set_heartbeat(timeout)) {
271 264 advwdt_set_heartbeat(WATCHDOG_TIMEOUT);
272   - printk (KERN_INFO PFX "timeout value must be 1<=x<=63, using %d\n",
273   - timeout);
  265 + printk(KERN_INFO PFX
  266 + "timeout value must be 1<=x<=63, using %d\n", timeout);
274 267 }
275 268  
276 269 ret = misc_register(&advwdt_miscdev);
277 270 if (ret != 0) {
278   - printk (KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
279   - WATCHDOG_MINOR, ret);
  271 + printk(KERN_ERR PFX
  272 + "cannot register miscdev on minor=%d (err=%d)\n",
  273 + WATCHDOG_MINOR, ret);
280 274 goto unreg_regions;
281 275 }
282   -
283   - printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
  276 + printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
284 277 timeout, nowayout);
285   -
286 278 out:
287 279 return ret;
288 280 unreg_regions:
... ... @@ -293,8 +285,7 @@
293 285 goto out;
294 286 }
295 287  
296   -static int __devexit
297   -advwdt_remove(struct platform_device *dev)
  288 +static int __devexit advwdt_remove(struct platform_device *dev)
298 289 {
299 290 misc_deregister(&advwdt_miscdev);
300 291 release_region(wdt_start,1);
... ... @@ -304,8 +295,7 @@
304 295 return 0;
305 296 }
306 297  
307   -static void
308   -advwdt_shutdown(struct platform_device *dev)
  298 +static void advwdt_shutdown(struct platform_device *dev)
309 299 {
310 300 /* Turn the WDT off if we have a soft shutdown */
311 301 advwdt_disable();
... ... @@ -321,8 +311,7 @@
321 311 },
322 312 };
323 313  
324   -static int __init
325   -advwdt_init(void)
  314 +static int __init advwdt_init(void)
326 315 {
327 316 int err;
328 317  
... ... @@ -332,7 +321,8 @@
332 321 if (err)
333 322 return err;
334 323  
335   - advwdt_platform_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0);
  324 + advwdt_platform_device = platform_device_register_simple(DRV_NAME,
  325 + -1, NULL, 0);
336 326 if (IS_ERR(advwdt_platform_device)) {
337 327 err = PTR_ERR(advwdt_platform_device);
338 328 goto unreg_platform_driver;
... ... @@ -345,8 +335,7 @@
345 335 return err;
346 336 }
347 337  
348   -static void __exit
349   -advwdt_exit(void)
  338 +static void __exit advwdt_exit(void)
350 339 {
351 340 platform_device_unregister(advwdt_platform_device);
352 341 platform_driver_unregister(&advwdt_driver);