From patchwork Tue Sep 14 08:30:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 178862 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8E8UZiL025303 for ; Tue, 14 Sep 2010 08:30:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213Ab0INIaZ (ORCPT ); Tue, 14 Sep 2010 04:30:25 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:46578 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062Ab0INIaY (ORCPT ); Tue, 14 Sep 2010 04:30:24 -0400 Received: from dlep33.itg.ti.com ([157.170.170.112]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o8E8UMvV022833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 14 Sep 2010 03:30:22 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o8E8UMex001003; Tue, 14 Sep 2010 03:30:22 -0500 (CDT) Received: from localhost (wsp000207077wss.emea.dhcp.ti.com [137.167.41.187]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o8E8UKf16002; Tue, 14 Sep 2010 03:30:20 -0500 (CDT) From: Felipe Balbi To: Linux OMAP Mailing List Cc: Jarkko Nikula , Tony Lindgren , Felipe Balbi Subject: [RFT/PATCH 1/8] cbus: Fix compile by converting ioctl calls to unlocked_ioctl calls Date: Tue, 14 Sep 2010 11:30:09 +0300 Message-Id: <1284453016-8295-2-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.3.rc0.35.g8ac8c In-Reply-To: <1284453016-8295-1-git-send-email-balbi@ti.com> References: <1284453016-8295-1-git-send-email-balbi@ti.com> Organization: Texas Instruments\n Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 08:30:36 +0000 (UTC) diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c index 953d92a..c36f356 100644 --- a/drivers/cbus/retu-user.c +++ b/drivers/cbus/retu-user.c @@ -270,8 +270,7 @@ static int retu_close(struct inode *inode, struct file *filp) /* * Device control (ioctl) */ -static int retu_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +static long retu_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct retu_tahvo_write_parms par; int ret; @@ -360,7 +359,7 @@ static unsigned retu_poll(struct file *filp, struct poll_table_struct *pt) static struct file_operations retu_user_fileops = { .owner = THIS_MODULE, - .ioctl = retu_ioctl, + .unlocked_ioctl = retu_ioctl, .read = retu_read, .release = retu_close, .poll = retu_poll diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c index 6070a05..3d83cdc 100644 --- a/drivers/cbus/retu-wdt.c +++ b/drivers/cbus/retu-wdt.c @@ -184,8 +184,8 @@ static ssize_t retu_wdt_write(struct file *file, const char __user *data, return len; } -static int retu_wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long retu_wdt_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) { int new_margin; @@ -246,7 +246,7 @@ static int __devinit retu_wdt_ping(void) static const struct file_operations retu_wdt_fops = { .owner = THIS_MODULE, .write = retu_wdt_write, - .ioctl = retu_wdt_ioctl, + .unlocked_ioctl = retu_wdt_ioctl, .open = retu_wdt_open, .release = retu_wdt_release, }; diff --git a/drivers/cbus/tahvo-user.c b/drivers/cbus/tahvo-user.c index bd30f06..9cfc71c 100644 --- a/drivers/cbus/tahvo-user.c +++ b/drivers/cbus/tahvo-user.c @@ -254,8 +254,7 @@ static int tahvo_close(struct inode *inode, struct file *filp) /* * Device control (ioctl) */ -static int tahvo_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +static long tahvo_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct retu_tahvo_write_parms par; int ret; @@ -342,7 +341,7 @@ static unsigned tahvo_poll(struct file *filp, struct poll_table_struct *pt) static struct file_operations tahvo_user_fileops = { .owner = THIS_MODULE, - .ioctl = tahvo_ioctl, + .unlocked_ioctl = tahvo_ioctl, .read = tahvo_read, .release = tahvo_close, .poll = tahvo_poll