From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Apr 2010 14:24:24 +0000 (+0200)
Subject: coda/psdev: Remove BKL from ioctl function
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=977183902a52d1e0adc986f9462424db5a545044;p=openwrt%2Fstaging%2Fblogic.git

coda/psdev: Remove BKL from ioctl function

The ioctl function returns constant results, so it obviously
does not need the BKL and can be converted to unlocked_ioctl.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index be4392ca2098..66b9cf79c5ba 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -73,8 +73,7 @@ static unsigned int coda_psdev_poll(struct file *file, poll_table * wait)
 	return mask;
 }
 
-static int coda_psdev_ioctl(struct inode * inode, struct file * filp, 
-			    unsigned int cmd, unsigned long arg)
+static long coda_psdev_ioctl(struct file * filp, unsigned int cmd, unsigned long arg)
 {
 	unsigned int data;
 
@@ -344,7 +343,7 @@ static const struct file_operations coda_psdev_fops = {
 	.read		= coda_psdev_read,
 	.write		= coda_psdev_write,
 	.poll		= coda_psdev_poll,
-	.ioctl		= coda_psdev_ioctl,
+	.unlocked_ioctl	= coda_psdev_ioctl,
 	.open		= coda_psdev_open,
 	.release	= coda_psdev_release,
 };