[WATCHDOG] sa1100_wdt.c sparse clean (2)
The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean. (similar to the other watchdog drivers) Signed-off-by: Ian Campbell <icampbell@arcom.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
bc6d7fdf46
commit
3a69e57913
1 changed files with 7 additions and 5 deletions
|
@ -93,23 +93,25 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
|
|||
{
|
||||
int ret = -ENOIOCTLCMD;
|
||||
int time;
|
||||
void __user *argp = (void __user *)arg;
|
||||
int __user *p = argp;
|
||||
|
||||
switch (cmd) {
|
||||
case WDIOC_GETSUPPORT:
|
||||
ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
|
||||
ret = copy_to_user(argp, &ident,
|
||||
sizeof(ident)) ? -EFAULT : 0;
|
||||
break;
|
||||
|
||||
case WDIOC_GETSTATUS:
|
||||
ret = put_user(0, (int __user *)arg);
|
||||
ret = put_user(0, p);
|
||||
break;
|
||||
|
||||
case WDIOC_GETBOOTSTATUS:
|
||||
ret = put_user(boot_status, (int __user *)arg);
|
||||
ret = put_user(boot_status, p);
|
||||
break;
|
||||
|
||||
case WDIOC_SETTIMEOUT:
|
||||
ret = get_user(time, (int __user *)arg);
|
||||
ret = get_user(time, p);
|
||||
if (ret)
|
||||
break;
|
||||
|
||||
|
@ -123,7 +125,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
|
|||
/*fall through*/
|
||||
|
||||
case WDIOC_GETTIMEOUT:
|
||||
ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg);
|
||||
ret = put_user(pre_margin / OSCR_FREQ, p);
|
||||
break;
|
||||
|
||||
case WDIOC_KEEPALIVE:
|
||||
|
|
Loading…
Reference in a new issue