Re: linux-next: Tree for January 23 (drivers/watchdog/cpwd.c:411:error: 'inode' undeclared (first use in this function))

From: Alexey Dobriyan
Date: Fri Jan 23 2009 - 16:16:27 EST


On sparc:

drivers/watchdog/cpwd.c: In function 'cpwd_ioctl':
drivers/watchdog/cpwd.c:411: error: 'inode' undeclared (first use in this function)
drivers/watchdog/cpwd.c:411: error: (Each undeclared identifier is reported only once
drivers/watchdog/cpwd.c:411: error: for each function it appears in.)
drivers/watchdog/cpwd.c: In function 'cpwd_compat_ioctl':
drivers/watchdog/cpwd.c:483: warning: passing argument 1 of 'cpwd_ioctl' from incompatible pointer type
drivers/watchdog/cpwd.c:483: warning: passing argument 2 of 'cpwd_ioctl' makes integer from pointer without a cast
drivers/watchdog/cpwd.c:483: error: too many arguments to function 'cpwd_ioctl'

Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---

drivers/watchdog/cpwd.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -402,6 +402,7 @@ static int cpwd_release(struct inode *inode, struct file *file)

static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
+ struct inode *inode = file->f_path.dentry->d_inode;
static struct watchdog_info info = {
.options = WDIOF_SETTIMEOUT,
.firmware_version = 1,
@@ -480,7 +481,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
case WIOCSTOP:
case WIOCGSTAT:
lock_kernel();
- rval = cpwd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
+ rval = cpwd_ioctl(file, cmd, arg);
unlock_kernel();
break;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/