Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 107864
b: refs/heads/master
c: 5eb8249
h: refs/heads/master
v: v3
  • Loading branch information
Wim Van Sebroeck committed Aug 6, 2008
1 parent c963f25 commit ed1aa2a
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 122 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d7b101404f7bedcf3f448c1667c3744551cd9ee
refs/heads/master: 5eb82498e3a6da8a979c48945e3c1a85c10ccc25
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/acquirewdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/watchdog/geodewdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
128 changes: 64 additions & 64 deletions trunk/drivers/watchdog/pcwd_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
104 changes: 52 additions & 52 deletions trunk/drivers/watchdog/pcwd_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/watchdog/sc1200wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/watchdog/sc520_wdt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit ed1aa2a

Please sign in to comment.