summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare2006-12-10 21:21:30 +0100
committerJean Delvare2006-12-10 21:21:30 +0100
commit2c003e8e1c0c241aec162ba9ec781089c5b2ff3f (patch)
tree612ab73ce5a6810bd3fb459520798b7a62e670d3
parenti2c: New Atmel AT91 bus driver (diff)
downloadkernel-qcow2-linux-2c003e8e1c0c241aec162ba9ec781089c5b2ff3f.tar.gz
kernel-qcow2-linux-2c003e8e1c0c241aec162ba9ec781089c5b2ff3f.tar.xz
kernel-qcow2-linux-2c003e8e1c0c241aec162ba9ec781089c5b2ff3f.zip
i2c: Use put_user instead of copy_to_user where possible
This speeds up the I2C_FUNCS ioctl by 5 to 8% in my tests. Signed-off-by: Jean Delvare <khali@linux-fr.org> Laughed-at-by: Mark M. Hoffman <mhoffman@lightlink.com>
-rw-r--r--drivers/i2c/i2c-dev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 2e22a2ffa606..d66cefc63df7 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -193,8 +193,7 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
return 0;
case I2C_FUNCS:
funcs = i2c_get_functionality(client->adapter);
- return (copy_to_user((unsigned long __user *)arg, &funcs,
- sizeof(unsigned long)))?-EFAULT:0;
+ return put_user(funcs, (unsigned long __user *)arg);
case I2C_RDWR:
if (copy_from_user(&rdwr_arg,