diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-07-14 22:38:27 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@mahadeva.delvare> | 2008-07-14 22:38:27 +0200 |
| commit | 77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad (patch) | |
| tree | dd49613bd990bbd76bdb69aa77b258d4175503a7 /drivers/i2c | |
| parent | 5bc1200852c3dfc312481f57622f48b289ac802e (diff) | |
| download | op-kernel-dev-77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad.zip op-kernel-dev-77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad.tar.gz | |
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/i2c')
| -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 d34c14c..e96d986 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, return res; } -static int i2cdev_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct i2c_client *client = (struct i2c_client *)file->private_data; unsigned long funcs; @@ -487,7 +486,7 @@ static const struct file_operations i2cdev_fops = { .llseek = no_llseek, .read = i2cdev_read, .write = i2cdev_write, - .ioctl = i2cdev_ioctl, + .unlocked_ioctl = i2cdev_ioctl, .open = i2cdev_open, .release = i2cdev_release, }; |
