[WATCHDOG] more coding style clean-up's

[linux-2.6] / drivers / watchdog / booke_wdt.c

diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c
index 4c423d531a891dc223235f7134072e7472b34199..c3b78a76f17398c464553fd93f4e8267ad99fb3a 100644 (file)
--- a/drivers/watchdog/booke_wdt.c
+++ b/drivers/watchdog/booke_wdt.c
@@ -55,7 +55,7 @@ static void __booke_wdt_ping(void *data)
 
 static void booke_wdt_ping(void)
 {
-       on_each_cpu(__booke_wdt_ping, NULL, 0, 0);
+       on_each_cpu(__booke_wdt_ping, NULL, 0);
 }
 
 static void __booke_wdt_enable(void *data)
@@ -99,6 +99,15 @@ static long booke_wdt_ioctl(struct file *file,
                tmp = mfspr(SPRN_TSR) & TSR_WRS(3);
                /* returns 1 if last reset was caused by the WDT */
                return (tmp ? 1 : 0);
+       case WDIOC_SETOPTIONS:
+               if (get_user(tmp, p))
+                       return -EINVAL;
+               if (tmp == WDIOS_ENABLECARD) {
+                       booke_wdt_ping();
+                       break;
+               } else
+                       return -EINVAL;
+               return 0;
        case WDIOC_KEEPALIVE:
                booke_wdt_ping();
                return 0;
@@ -110,15 +119,6 @@ static long booke_wdt_ioctl(struct file *file,
                return 0;
        case WDIOC_GETTIMEOUT:
                return put_user(booke_wdt_period, p);
-       case WDIOC_SETOPTIONS:
-               if (get_user(tmp, p))
-                       return -EINVAL;
-               if (tmp == WDIOS_ENABLECARD) {
-                       booke_wdt_ping();
-                       break;
-               } else
-                       return -EINVAL;
-               return 0;
        default:
                return -ENOTTY;
        }
@@ -131,7 +131,7 @@ static int booke_wdt_open(struct inode *inode, struct file *file)
        spin_lock(&booke_wdt_lock);
        if (booke_wdt_enabled == 0) {
                booke_wdt_enabled = 1;
-               on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
+               on_each_cpu(__booke_wdt_enable, NULL, 0);
                printk(KERN_INFO
                      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
                                booke_wdt_period);
@@ -179,7 +179,7 @@ static int __init booke_wdt_init(void)
                printk(KERN_INFO
                      "PowerPC Book-E Watchdog Timer Enabled (wdt_period=%d)\n",
                                booke_wdt_period);
-               on_each_cpu(__booke_wdt_enable, NULL, 0, 0);
+               on_each_cpu(__booke_wdt_enable, NULL, 0);
        }
        spin_unlock(&booke_wdt_lock);