Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77e38bff authored by Alan Cox's avatar Alan Cox Committed by Jean Delvare
Browse files

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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 5bc12008

drivers/i2c/i2c-dev.c

+2 −3
Original line number Diff line number Diff line
@@ -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,

};