projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i2c: Push ioctl BKL down into the i2c code
[deliverable/linux.git]
/
drivers
/
i2c
/
i2c-dev.c
diff --git
a/drivers/i2c/i2c-dev.c
b/drivers/i2c/i2c-dev.c
index d34c14c81c291e9beabf7100530307b8a42e8914..e96d98696782d230bb7b7070b7be1d67c75d289c 100644
(file)
--- 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;
}
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;
{
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,
.llseek = no_llseek,
.read = i2cdev_read,
.write = i2cdev_write,
- .
ioctl
= i2cdev_ioctl,
+ .
unlocked_ioctl
= i2cdev_ioctl,
.open = i2cdev_open,
.release = i2cdev_release,
};
.open = i2cdev_open,
.release = i2cdev_release,
};
This page took
0.02354 seconds
and
5
git commands to generate.