diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2009-03-26 08:58:19 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-27 12:19:08 -0400 |
commit | 2b24ef093aec6d7b9c18af75644ec22b4069b283 (patch) | |
tree | 7113fb2033c0f7b0fc1721c13e20013e6f05b092 /drivers/platform/x86/sony-laptop.c | |
parent | 1cae71032183776e833036fe828315dcd3444df1 (diff) |
sony-laptop: Eliminate BKL in ioctls
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 4f932889569b..813d0e03d9c5 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
@@ -2224,8 +2224,8 @@ static int ec_read16(u8 addr, u16 *value) | |||
2224 | return 0; | 2224 | return 0; |
2225 | } | 2225 | } |
2226 | 2226 | ||
2227 | static int sonypi_misc_ioctl(struct inode *ip, struct file *fp, | 2227 | static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd, |
2228 | unsigned int cmd, unsigned long arg) | 2228 | unsigned long arg) |
2229 | { | 2229 | { |
2230 | int ret = 0; | 2230 | int ret = 0; |
2231 | void __user *argp = (void __user *)arg; | 2231 | void __user *argp = (void __user *)arg; |
@@ -2359,7 +2359,7 @@ static const struct file_operations sonypi_misc_fops = { | |||
2359 | .open = sonypi_misc_open, | 2359 | .open = sonypi_misc_open, |
2360 | .release = sonypi_misc_release, | 2360 | .release = sonypi_misc_release, |
2361 | .fasync = sonypi_misc_fasync, | 2361 | .fasync = sonypi_misc_fasync, |
2362 | .ioctl = sonypi_misc_ioctl, | 2362 | .unlocked_ioctl = sonypi_misc_ioctl, |
2363 | }; | 2363 | }; |
2364 | 2364 | ||
2365 | static struct miscdevice sonypi_misc_device = { | 2365 | static struct miscdevice sonypi_misc_device = { |