From patchwork Thu Mar 26 12:58:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattia Dongili X-Patchwork-Id: 14521 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2QCwTlM018718 for ; Thu, 26 Mar 2009 12:58:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756561AbZCZM6j (ORCPT ); Thu, 26 Mar 2009 08:58:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756511AbZCZM6i (ORCPT ); Thu, 26 Mar 2009 08:58:38 -0400 Received: from static-220-247-10-204.b-man.svips.gol.ne.jp ([220.247.10.204]:53422 "EHLO smtp.kamineko.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756561AbZCZM6a (ORCPT ); Thu, 26 Mar 2009 08:58:30 -0400 Received: from tadamune.kamineko.org (unknown [192.168.1.21]) by smtp.kamineko.org (Postfix) with ESMTP id AB53226002; Thu, 26 Mar 2009 21:58:26 +0900 (JST) Received: by tadamune.kamineko.org (Postfix, from userid 1000) id 40E3513133; Thu, 26 Mar 2009 21:58:26 +0900 (JST) From: Mattia Dongili To: Len Brown Cc: linux-acpi@vger.kernel.org, Alan Cox , Alan Cox , Mattia Dongili Subject: [PATCH 08/14] sony-laptop: Eliminate BKL in ioctls Date: Thu, 26 Mar 2009 21:58:19 +0900 Message-Id: <1238072305-8085-9-git-send-email-malattia@linux.it> X-Mailer: git-send-email 1.6.2 In-Reply-To: <1238072305-8085-8-git-send-email-malattia@linux.it> References: <1238072305-8085-1-git-send-email-malattia@linux.it> <1238072305-8085-2-git-send-email-malattia@linux.it> <1238072305-8085-3-git-send-email-malattia@linux.it> <1238072305-8085-4-git-send-email-malattia@linux.it> <1238072305-8085-5-git-send-email-malattia@linux.it> <1238072305-8085-6-git-send-email-malattia@linux.it> <1238072305-8085-7-git-send-email-malattia@linux.it> <1238072305-8085-8-git-send-email-malattia@linux.it> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Alan Cox Signed-off-by: Alan Cox Signed-off-by: Mattia Dongili --- 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 4f93288..813d0e0 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) 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; @@ -2359,7 +2359,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 = {