diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-07-14 16:38:27 -0400 |
---|---|---|
committer | Jean Delvare <khali@mahadeva.delvare> | 2008-07-14 16:38:27 -0400 |
commit | 77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad (patch) | |
tree | dd49613bd990bbd76bdb69aa77b258d4175503a7 /drivers | |
parent | 5bc1200852c3dfc312481f57622f48b289ac802e (diff) |
i2c: Push ioctl BKL down into the i2c code
This is part of the effort to get rid of the BKL.
[JD: In fact i2c-dev doesn't need more locking than is already done
for the other i2c drivers, so we can simply switch to unlocked_ioctl.]
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/i2c-dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index d34c14c81c29..e96d98696782 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
@@ -366,8 +366,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client, | |||
366 | return res; | 366 | return res; |
367 | } | 367 | } |
368 | 368 | ||
369 | static int i2cdev_ioctl(struct inode *inode, struct file *file, | 369 | static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
370 | unsigned int cmd, unsigned long arg) | ||
371 | { | 370 | { |
372 | struct i2c_client *client = (struct i2c_client *)file->private_data; | 371 | struct i2c_client *client = (struct i2c_client *)file->private_data; |
373 | unsigned long funcs; | 372 | unsigned long funcs; |
@@ -487,7 +486,7 @@ static const struct file_operations i2cdev_fops = { | |||
487 | .llseek = no_llseek, | 486 | .llseek = no_llseek, |
488 | .read = i2cdev_read, | 487 | .read = i2cdev_read, |
489 | .write = i2cdev_write, | 488 | .write = i2cdev_write, |
490 | .ioctl = i2cdev_ioctl, | 489 | .unlocked_ioctl = i2cdev_ioctl, |
491 | .open = i2cdev_open, | 490 | .open = i2cdev_open, |
492 | .release = i2cdev_release, | 491 | .release = i2cdev_release, |
493 | }; | 492 | }; |