From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mattia Dongili Subject: [PATCH 3/7] [sony-laptop] Eliminate BKL in ioctls Date: Mon, 3 Nov 2008 18:41:16 +0900 Message-ID: <1225705280-12775-4-git-send-email-malattia@linux.it> References: <1225705280-12775-1-git-send-email-malattia@linux.it> <1225705280-12775-2-git-send-email-malattia@linux.it> <1225705280-12775-3-git-send-email-malattia@linux.it> Return-path: Received: from static-220-247-10-204.b-man.svips.gol.ne.jp ([220.247.10.204]:48112 "EHLO tadamune.kami.home" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754946AbYKCJlY (ORCPT ); Mon, 3 Nov 2008 04:41:24 -0500 In-Reply-To: <1225705280-12775-3-git-send-email-malattia@linux.it> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Len Brown Cc: linux-acpi@vger.kernel.org, Alan Cox , Alan Cox , Mattia Dongili From: Alan Cox Signed-off-by: Alan Cox Signed-off-by: Mattia Dongili --- drivers/misc/sony-laptop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 4c9a3e8..c9e5651 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c @@ -1989,8 +1989,8 @@ static int ec_read16(u8 addr, u16 *value) return 0; } -static int sonypi_misc_ioctl(struct inode *ip, struct file *fp, - unsigned int cmd, unsigned long arg) +static long sonypi_misc_ioctl(struct file *fp, unsigned int cmd, + unsigned long arg) { int ret = 0; void __user *argp = (void __user *)arg; @@ -2124,7 +2124,7 @@ static const struct file_operations sonypi_misc_fops = { .open = sonypi_misc_open, .release = sonypi_misc_release, .fasync = sonypi_misc_fasync, - .ioctl = sonypi_misc_ioctl, + .unlocked_ioctl = sonypi_misc_ioctl, }; static struct miscdevice sonypi_misc_device = { -- 1.5.6.5