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>
This commit is contained in:
parent
5bc1200852
commit
77e38bffe0
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue