Skip to content

Commit

Permalink
[WATCHDOG] sa1100_wdt.c sparse cleanups
Browse files Browse the repository at this point in the history
The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean.

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Ian Campbell authored and Wim Van Sebroeck committed Jan 15, 2006
1 parent 6b4977c commit a073404
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/char/watchdog/sa1100_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static int sa1100dog_release(struct inode *inode, struct file *file)
return 0;
}

static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
{
if (len)
/* Refresh OSMR3 timer. */
Expand All @@ -96,20 +96,20 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,

switch (cmd) {
case WDIOC_GETSUPPORT:
ret = copy_to_user((struct watchdog_info *)arg, &ident,
ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
sizeof(ident)) ? -EFAULT : 0;
break;

case WDIOC_GETSTATUS:
ret = put_user(0, (int *)arg);
ret = put_user(0, (int __user *)arg);
break;

case WDIOC_GETBOOTSTATUS:
ret = put_user(boot_status, (int *)arg);
ret = put_user(boot_status, (int __user *)arg);
break;

case WDIOC_SETTIMEOUT:
ret = get_user(time, (int *)arg);
ret = get_user(time, (int __user *)arg);
if (ret)
break;

Expand All @@ -123,7 +123,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
/*fall through*/

case WDIOC_GETTIMEOUT:
ret = put_user(pre_margin / OSCR_FREQ, (int *)arg);
ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg);
break;

case WDIOC_KEEPALIVE:
Expand Down

0 comments on commit a073404

Please sign in to comment.