system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 11:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

i2c: Push ioctl BKL down into the i2c code

Browse source 
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:
Alan Cox 2008-07-14 22:38:27 +02:00 committed by Jean Delvare
parent 5bc1200852
commit 77e38bffe0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/i2c/i2c-dev.c
View file

@ -366,8 +366,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client,
return res; return res;
} }
static int i2cdev_ioctl(struct inode *inode, struct file *file, static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
struct i2c_client *client = (struct i2c_client *)file->private_data; struct i2c_client *client = (struct i2c_client *)file->private_data;
unsigned long funcs; unsigned long funcs;
@ -487,7 +486,7 @@ static const struct file_operations i2cdev_fops = {
.llseek = no_llseek, .llseek = no_llseek,
.read = i2cdev_read, .read = i2cdev_read,
.write = i2cdev_write, .write = i2cdev_write,
.ioctl = i2cdev_ioctl, .unlocked_ioctl = i2cdev_ioctl,
.open = i2cdev_open, .open = i2cdev_open,
.release = i2cdev_release, .release = i2cdev_release,
}; };