From patchwork Sun Mar 1 04:40:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattia Dongili X-Patchwork-Id: 9420 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 n214otWQ004498 for ; Sun, 1 Mar 2009 04:50:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751639AbZCAEu2 (ORCPT ); Sat, 28 Feb 2009 23:50:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751724AbZCAEu1 (ORCPT ); Sat, 28 Feb 2009 23:50:27 -0500 Received: from static-220-247-10-204.b-man.svips.gol.ne.jp ([220.247.10.204]:48654 "EHLO smtp.kamineko.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756407AbZCAEuT (ORCPT ); Sat, 28 Feb 2009 23:50:19 -0500 Received: from tadamune.kamineko.org (unknown [192.168.1.21]) by smtp.kamineko.org (Postfix) with ESMTP id E06D02F024; Sun, 1 Mar 2009 13:40:45 +0900 (JST) Received: by tadamune.kamineko.org (Postfix, from userid 1000) id 1C46B1313F; Sun, 1 Mar 2009 13:40:45 +0900 (JST) From: Mattia Dongili To: Len Brown Cc: linux-acpi@vger.kernel.org, Alan Cox , Alan Cox , Mattia Dongili Subject: [PATCH 3/9] [sony-laptop] Eliminate BKL in ioctls Date: Sun, 1 Mar 2009 13:40:39 +0900 Message-Id: <1235882445-2404-4-git-send-email-malattia@linux.it> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235882445-2404-1-git-send-email-malattia@linux.it> References: <1235882445-2404-1-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 c710840..35491d9 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1996,8 +1996,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; @@ -2131,7 +2131,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 = {