[WATCHDOG] Coding style - Indentation - part 1

This brings the watchdog drivers into line with coding style.
This patch takes cares of the indentation as described in chapter 1:
  The preferred way to ease multiple indentation levels in a switch
  statement is to align the "switch" and its subordinate "case"
  labels in the same column instead of "double-indenting" the "case"
  labels.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

6 files changed, 119 insertions, 121 deletions

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 28d9057c9be6..340d1eeec16b 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -169,7 +169,7 @@ static long acq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 return 0;
 
         case WDIOC_GETTIMEOUT:
-          return put_user(WATCHDOG_HEARTBEAT, p);
+                return put_user(WATCHDOG_HEARTBEAT, p);
 
         case WDIOC_SETOPTIONS:
         {
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index a41f57ce581a..74c00698801d 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -149,7 +149,7 @@ geodewdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 .identity =             WATCHDOG_NAME,
         };
 
-        switch(cmd) {
+        switch (cmd) {
         case WDIOC_GETSUPPORT:
                 return copy_to_user(argp, &ident,
                                     sizeof(ident)) ? -EFAULT : 0;
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 67d90810c6e9..7f500ee4ee8a 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -470,90 +470,90 @@ static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
         };
 
         switch (cmd) {
-                case WDIOC_GETSUPPORT:
-                        return copy_to_user(argp, &ident,
-                                sizeof (ident)) ? -EFAULT : 0;
-
-                case WDIOC_GETSTATUS:
-                {
-                        int status;
-                        pcipcwd_get_status(&status);
-                        return put_user(status, p);
-                }
+        case WDIOC_GETSUPPORT:
+                return copy_to_user(argp, &ident,
+                        sizeof (ident)) ? -EFAULT : 0;
+
+        case WDIOC_GETSTATUS:
+        {
+                int status;
+                pcipcwd_get_status(&status);
+                return put_user(status, p);
+        }
 
-                case WDIOC_GETBOOTSTATUS:
-                        return put_user(pcipcwd_private.boot_status, p);
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(pcipcwd_private.boot_status, p);
 
-                case WDIOC_GETTEMP:
-                {
-                        int temperature;
+        case WDIOC_GETTEMP:
+        {
+                int temperature;
 
-                        if (pcipcwd_get_temperature(&temperature))
-                                return -EFAULT;
+                if (pcipcwd_get_temperature(&temperature))
+                        return -EFAULT;
 
-                        return put_user(temperature, p);
-                }
-
-                case WDIOC_KEEPALIVE:
-                        pcipcwd_keepalive();
-                        return 0;
+                return put_user(temperature, p);
+        }
 
-                case WDIOC_SETOPTIONS:
-                {
-                        int new_options, retval = -EINVAL;
+        case WDIOC_KEEPALIVE:
+                pcipcwd_keepalive();
+                return 0;
 
-                        if (get_user (new_options, p))
-                                return -EFAULT;
+        case WDIOC_SETOPTIONS:
+        {
+                int new_options, retval = -EINVAL;
 
-                        if (new_options & WDIOS_DISABLECARD) {
-                                if (pcipcwd_stop())
-                                        return -EIO;
-                                retval = 0;
-                        }
+                if (get_user (new_options, p))
+                        return -EFAULT;
 
-                        if (new_options & WDIOS_ENABLECARD) {
-                                if (pcipcwd_start())
-                                        return -EIO;
-                                retval = 0;
-                        }
+                if (new_options & WDIOS_DISABLECARD) {
+                        if (pcipcwd_stop())
+                                return -EIO;
+                        retval = 0;
+                }
 
-                        if (new_options & WDIOS_TEMPPANIC) {
-                                temp_panic = 1;
-                                retval = 0;
-                        }
+                if (new_options & WDIOS_ENABLECARD) {
+                        if (pcipcwd_start())
+                                return -EIO;
+                        retval = 0;
+                }
 
-                        return retval;
+                if (new_options & WDIOS_TEMPPANIC) {
+                        temp_panic = 1;
+                        retval = 0;
                 }
 
-                case WDIOC_SETTIMEOUT:
-                {
-                        int new_heartbeat;
+                return retval;
+        }
 
-                        if (get_user(new_heartbeat, p))
-                                return -EFAULT;
+        case WDIOC_SETTIMEOUT:
+        {
+                int new_heartbeat;
 
-                        if (pcipcwd_set_heartbeat(new_heartbeat))
-                            return -EINVAL;
+                if (get_user(new_heartbeat, p))
+                        return -EFAULT;
 
-                        pcipcwd_keepalive();
-                        /* Fall */
-                }
+                if (pcipcwd_set_heartbeat(new_heartbeat))
+                    return -EINVAL;
 
-                case WDIOC_GETTIMEOUT:
-                        return put_user(heartbeat, p);
+                pcipcwd_keepalive();
+                /* Fall */
+        }
 
-                case WDIOC_GETTIMELEFT:
-                {
-                        int time_left;
+        case WDIOC_GETTIMEOUT:
+                return put_user(heartbeat, p);
 
-                        if (pcipcwd_get_timeleft(&time_left))
-                                return -EFAULT;
+        case WDIOC_GETTIMELEFT:
+        {
+                int time_left;
 
-                        return put_user(time_left, p);
-                }
+                if (pcipcwd_get_timeleft(&time_left))
+                        return -EFAULT;
+
+                return put_user(time_left, p);
+        }
 
-                default:
-                        return -ENOTTY;
+        default:
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index bc399cf65cf7..8194435052c8 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -382,77 +382,77 @@ static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
         };
 
         switch (cmd) {
-                case WDIOC_GETSUPPORT:
-                        return copy_to_user(argp, &ident,
-                                sizeof (ident)) ? -EFAULT : 0;
+        case WDIOC_GETSUPPORT:
+                return copy_to_user(argp, &ident,
+                        sizeof (ident)) ? -EFAULT : 0;
 
-                case WDIOC_GETSTATUS:
-                case WDIOC_GETBOOTSTATUS:
-                        return put_user(0, p);
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                return put_user(0, p);
 
-                case WDIOC_GETTEMP:
-                {
-                        int temperature;
+        case WDIOC_GETTEMP:
+        {
+                int temperature;
 
-                        if (usb_pcwd_get_temperature(usb_pcwd_device, &temperature))
-                                return -EFAULT;
+                if (usb_pcwd_get_temperature(usb_pcwd_device, &temperature))
+                        return -EFAULT;
 
-                        return put_user(temperature, p);
-                }
+                return put_user(temperature, p);
+        }
 
-                case WDIOC_KEEPALIVE:
-                        usb_pcwd_keepalive(usb_pcwd_device);
-                        return 0;
+        case WDIOC_KEEPALIVE:
+                usb_pcwd_keepalive(usb_pcwd_device);
+                return 0;
 
-                case WDIOC_SETOPTIONS:
-                {
-                        int new_options, retval = -EINVAL;
+        case WDIOC_SETOPTIONS:
+        {
+                int new_options, retval = -EINVAL;
 
-                        if (get_user (new_options, p))
-                                return -EFAULT;
+                if (get_user (new_options, p))
+                        return -EFAULT;
 
-                        if (new_options & WDIOS_DISABLECARD) {
-                                usb_pcwd_stop(usb_pcwd_device);
-                                retval = 0;
-                        }
-
-                        if (new_options & WDIOS_ENABLECARD) {
-                                usb_pcwd_start(usb_pcwd_device);
-                                retval = 0;
-                        }
+                if (new_options & WDIOS_DISABLECARD) {
+                        usb_pcwd_stop(usb_pcwd_device);
+                        retval = 0;
+                }
 
-                        return retval;
+                if (new_options & WDIOS_ENABLECARD) {
+                        usb_pcwd_start(usb_pcwd_device);
+                        retval = 0;
                 }
 
-                case WDIOC_SETTIMEOUT:
-                {
-                        int new_heartbeat;
+                return retval;
+        }
 
-                        if (get_user(new_heartbeat, p))
-                                return -EFAULT;
+        case WDIOC_SETTIMEOUT:
+        {
+                int new_heartbeat;
 
-                        if (usb_pcwd_set_heartbeat(usb_pcwd_device, new_heartbeat))
-                            return -EINVAL;
+                if (get_user(new_heartbeat, p))
+                        return -EFAULT;
 
-                        usb_pcwd_keepalive(usb_pcwd_device);
-                        /* Fall */
-                }
+                if (usb_pcwd_set_heartbeat(usb_pcwd_device, new_heartbeat))
+                    return -EINVAL;
 
-                case WDIOC_GETTIMEOUT:
-                        return put_user(heartbeat, p);
+                usb_pcwd_keepalive(usb_pcwd_device);
+                /* Fall */
+        }
 
-                case WDIOC_GETTIMELEFT:
-                {
-                        int time_left;
+        case WDIOC_GETTIMEOUT:
+                return put_user(heartbeat, p);
 
-                        if (usb_pcwd_get_timeleft(usb_pcwd_device, &time_left))
-                                return -EFAULT;
+        case WDIOC_GETTIMELEFT:
+        {
+                int time_left;
 
-                        return put_user(time_left, p);
-                }
+                if (usb_pcwd_get_timeleft(usb_pcwd_device, &time_left))
+                        return -EFAULT;
+
+                return put_user(time_left, p);
+        }
 
-                default:
-                        return -ENOTTY;
+        default:
+                return -ENOTTY;
         }
 }
 
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 621ebad56d86..03e67fa4d689 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -196,7 +196,6 @@ static long sc1200wdt_ioctl(struct file *file, unsigned int cmd,
         };
 
         switch (cmd) {
-
         case WDIOC_GETSUPPORT:
                 if (copy_to_user(argp, &ident, sizeof ident))
                         return -EFAULT;
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index 01de239f49e8..1d5ba15dec63 100644
--- a/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@ -290,8 +290,7 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 .identity = "SC520",
         };
 
-        switch (cmd)
-        {
+        switch (cmd) {
         default:
                 return -ENOTTY;
         case WDIOC_GETSUPPORT: