Commit edf86c9b authored Sep 16, 2008 by Ben Dooks Committed by Wim Van Sebroeck Sep 23, 2008

[WATCHDOG] wdt285: fix sparse warnings



The wdt285.c watchdog driver is producing a number of
sparse errors due to missing __user attributes to calls
to put_user and copy_to_user, as well as in the prototype
of watchdog_write.

wdt285.c:144:21: warning: incorrect type in argument 1 (different address spaces)
wdt285.c:144:21:    expected void [noderef] <asn:1>*to
wdt285.c:144:21:    got void *<noident>
wdt285.c:150:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:150:9:    expected int const [noderef] <asn:1>*register __p
wdt285.c:150:9:    got int *<noident>
wdt285.c:159:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:159:9:    expected int const [noderef] <asn:1>*register __p
wdt285.c:159:9:    got int *<noident>
wdt285.c:174:9: warning: incorrect type in initializer (different address spaces)
wdt285.c:174:9:    expected int const [noderef] <asn:1>*register __p
wdt285.c:174:9:    got int *<noident>
wdt285.c:183:12: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
wdt285.c:183:12:    expected int ( *write )( ... )
wdt285.c:183:12:    got int ( static [toplevel] *<noident> )( ... )

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 7f605ac0

drivers/watchdog/wdt285.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static int watchdog_release(struct inode inode, struct file file)
		return 0;
		}

		static ssize_t watchdog_write(struct file file, const char data,
		static ssize_t watchdog_write(struct file file, const char __user data,
		size_t len, loff_t *ppos)
		{
		/*
		@@ -136,18 +136,19 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
		unsigned long arg)
		{
		unsigned int new_margin;
		int __user int_arg = (int __user )arg;
		int ret = -ENOTTY;

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

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

		case WDIOC_KEEPALIVE:
		@@ -156,7 +157,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
		break;

		case WDIOC_SETTIMEOUT:
		ret = get_user(new_margin, (int *)arg);
		ret = get_user(new_margin, int_arg);
		if (ret)
		break;

		@@ -171,7 +172,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd,
		watchdog_ping();
		/* Fall */
		case WDIOC_GETTIMEOUT:
		ret = put_user(soft_margin, (int *)arg);
		ret = put_user(soft_margin, int_arg);
		break;
		}
		return ret;