diff options
Diffstat (limited to 'drivers/watchdog/rm9k_wdt.c')
-rw-r--r-- | drivers/watchdog/rm9k_wdt.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/watchdog/rm9k_wdt.c b/drivers/watchdog/rm9k_wdt.c index c172906b553c..f1ae3729a19e 100644 --- a/drivers/watchdog/rm9k_wdt.c +++ b/drivers/watchdog/rm9k_wdt.c | |||
@@ -234,8 +234,8 @@ static int wdt_gpi_release(struct inode *inode, struct file *file) | |||
234 | return 0; | 234 | return 0; |
235 | } | 235 | } |
236 | 236 | ||
237 | static ssize_t | 237 | static ssize_t wdt_gpi_write(struct file *f, const char __user *d, size_t s, |
238 | wdt_gpi_write(struct file *f, const char __user *d, size_t s, loff_t *o) | 238 | loff_t *o) |
239 | { | 239 | { |
240 | char val; | 240 | char val; |
241 | 241 | ||
@@ -325,8 +325,8 @@ static long wdt_gpi_ioctl(struct file *f, unsigned int cmd, unsigned long arg) | |||
325 | 325 | ||
326 | 326 | ||
327 | /* Shutdown notifier */ | 327 | /* Shutdown notifier */ |
328 | static int | 328 | static int wdt_gpi_notify(struct notifier_block *this, unsigned long code, |
329 | wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused) | 329 | void *unused) |
330 | { | 330 | { |
331 | if (code == SYS_DOWN || code == SYS_HALT) | 331 | if (code == SYS_DOWN || code == SYS_HALT) |
332 | wdt_gpi_stop(); | 332 | wdt_gpi_stop(); |
@@ -336,9 +336,8 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused) | |||
336 | 336 | ||
337 | 337 | ||
338 | /* Init & exit procedures */ | 338 | /* Init & exit procedures */ |
339 | static const struct resource * | 339 | static const struct resource *wdt_gpi_get_resource(struct platform_device *pdv, |
340 | wdt_gpi_get_resource(struct platform_device *pdv, const char *name, | 340 | const char *name, unsigned int type) |
341 | unsigned int type) | ||
342 | { | 341 | { |
343 | char buf[80]; | 342 | char buf[80]; |
344 | if (snprintf(buf, sizeof buf, "%s_0", name) >= sizeof buf) | 343 | if (snprintf(buf, sizeof buf, "%s_0", name) >= sizeof buf) |