OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Wim Van Sebroeck 2008-07-17 18:08:47 +00:00
parent 0d7b101404
commit 5eb82498e3
6 changed files with 127 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/watchdog/acquirewdt.c
View File

@ -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:
{

2
drivers/watchdog/geodewdt.c
View File

@ -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;

138
drivers/watchdog/pcwd_pci.c
View File

@ -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_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_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_GETTEMP:
{
int temperature;
if (pcipcwd_get_temperature(&temperature))
return -EFAULT;
return put_user(temperature, p);
}
case WDIOC_KEEPALIVE:
pcipcwd_keepalive();
return 0;
case WDIOC_SETOPTIONS:
{
int new_options, retval = -EINVAL;
if (get_user (new_options, p))
return -EFAULT;
if (new_options & WDIOS_DISABLECARD) {
if (pcipcwd_stop())
return -EIO;
retval = 0;
}
case WDIOC_GETBOOTSTATUS:
return put_user(pcipcwd_private.boot_status, p);
case WDIOC_GETTEMP:
{
int temperature;
if (pcipcwd_get_temperature(&temperature))
return -EFAULT;
return put_user(temperature, p);
if (new_options & WDIOS_ENABLECARD) {
if (pcipcwd_start())
return -EIO;
retval = 0;
}
case WDIOC_KEEPALIVE:
pcipcwd_keepalive();
return 0;
case WDIOC_SETOPTIONS:
{
int new_options, retval = -EINVAL;
if (get_user (new_options, p))
return -EFAULT;
if (new_options & WDIOS_DISABLECARD) {
if (pcipcwd_stop())
return -EIO;
retval = 0;
}
if (new_options & WDIOS_ENABLECARD) {
if (pcipcwd_start())
return -EIO;
retval = 0;
}
if (new_options & WDIOS_TEMPPANIC) {
temp_panic = 1;
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;
default:
return -ENOTTY;
return put_user(time_left, p);
}
default:
return -ENOTTY;
}
}

110
drivers/watchdog/pcwd_usb.c
View File

@ -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_SETOPTIONS:
{
int new_options, retval = -EINVAL;
if (get_user (new_options, p))
return -EFAULT;
if (new_options & WDIOS_DISABLECARD) {
usb_pcwd_stop(usb_pcwd_device);
retval = 0;
}
case WDIOC_KEEPALIVE:
usb_pcwd_keepalive(usb_pcwd_device);
return 0;
case WDIOC_SETOPTIONS:
{
int new_options, retval = -EINVAL;
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;
}
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;
default:
return -ENOTTY;
return put_user(time_left, p);
}
default:
return -ENOTTY;
}
}

1
drivers/watchdog/sc1200wdt.c
View File

@ -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;

3
drivers/watchdog/sc520_wdt.c
View File

@ -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: