diff options
| author | Ian Campbell <icampbell@arcom.com> | 2005-11-02 03:56:49 -0500 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-01-15 15:06:13 -0500 |
| commit | a073404272e8003816d9198f639b1bf11ff0a864 (patch) | |
| tree | 67036411b7afd327ce3ac72b001578509652094e | |
| parent | 6b4977ce0fb9a989ba24fd6b757d07a566abc23d (diff) | |
[WATCHDOG] sa1100_wdt.c sparse cleanups
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>
| -rw-r--r-- | drivers/char/watchdog/sa1100_wdt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c index fb88b4041dca..b474ea52d6e8 100644 --- a/drivers/char/watchdog/sa1100_wdt.c +++ b/drivers/char/watchdog/sa1100_wdt.c | |||
| @@ -74,7 +74,7 @@ static int sa1100dog_release(struct inode *inode, struct file *file) | |||
| 74 | return 0; | 74 | return 0; |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos) | 77 | static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos) |
| 78 | { | 78 | { |
| 79 | if (len) | 79 | if (len) |
| 80 | /* Refresh OSMR3 timer. */ | 80 | /* Refresh OSMR3 timer. */ |
| @@ -96,20 +96,20 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file, | |||
| 96 | 96 | ||
| 97 | switch (cmd) { | 97 | switch (cmd) { |
| 98 | case WDIOC_GETSUPPORT: | 98 | case WDIOC_GETSUPPORT: |
| 99 | ret = copy_to_user((struct watchdog_info *)arg, &ident, | 99 | ret = copy_to_user((struct watchdog_info __user *)arg, &ident, |
| 100 | sizeof(ident)) ? -EFAULT : 0; | 100 | sizeof(ident)) ? -EFAULT : 0; |
| 101 | break; | 101 | break; |
| 102 | 102 | ||
| 103 | case WDIOC_GETSTATUS: | 103 | case WDIOC_GETSTATUS: |
| 104 | ret = put_user(0, (int *)arg); | 104 | ret = put_user(0, (int __user *)arg); |
| 105 | break; | 105 | break; |
| 106 | 106 | ||
| 107 | case WDIOC_GETBOOTSTATUS: | 107 | case WDIOC_GETBOOTSTATUS: |
| 108 | ret = put_user(boot_status, (int *)arg); | 108 | ret = put_user(boot_status, (int __user *)arg); |
| 109 | break; | 109 | break; |
| 110 | 110 | ||
| 111 | case WDIOC_SETTIMEOUT: | 111 | case WDIOC_SETTIMEOUT: |
| 112 | ret = get_user(time, (int *)arg); | 112 | ret = get_user(time, (int __user *)arg); |
| 113 | if (ret) | 113 | if (ret) |
| 114 | break; | 114 | break; |
| 115 | 115 | ||
| @@ -123,7 +123,7 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file, | |||
| 123 | /*fall through*/ | 123 | /*fall through*/ |
| 124 | 124 | ||
| 125 | case WDIOC_GETTIMEOUT: | 125 | case WDIOC_GETTIMEOUT: |
| 126 | ret = put_user(pre_margin / OSCR_FREQ, (int *)arg); | 126 | ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg); |
| 127 | break; | 127 | break; |
| 128 | 128 | ||
| 129 | case WDIOC_KEEPALIVE: | 129 | case WDIOC_KEEPALIVE: |
