From: Erik Gilling <konkers@android.com>
Date: Tue, 31 Aug 2010 01:15:47 +0000 (-0700)
Subject: misc: gps-gpio-brcm4750: move to unlocked_ioctl
X-Git-Tag: firefly_0821_release~9834^2~498
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f96c132eb0e0da3cc7ccef6e8bf736d2565dc4c;p=firefly-linux-kernel-4.4.55.git

misc: gps-gpio-brcm4750: move to unlocked_ioctl

Change-Id: I527542ef5fdd260036e2a29e697baeea592cde2b
---

diff --git a/drivers/misc/gps-gpio-brcm4750.c b/drivers/misc/gps-gpio-brcm4750.c
index 0b53badf7a62..0706e1cc73ac 100755
--- a/drivers/misc/gps-gpio-brcm4750.c
+++ b/drivers/misc/gps-gpio-brcm4750.c
@@ -30,8 +30,8 @@
 
 struct gps_gpio_brcm4750_platform_data *gps_gpio_data;
 
-static int gps_brcm4750_ioctl(struct inode *inode,
-		struct file *filp, unsigned int cmd, unsigned long arg)
+static long gps_brcm4750_ioctl(struct file *filp,
+			       unsigned int cmd, unsigned long arg)
 {
 	unsigned int gpio_val;
 
@@ -68,7 +68,7 @@ static int gps_brcm4750_ioctl(struct inode *inode,
 
 static const struct file_operations gps_brcm4750_fops = {
 	.owner		= THIS_MODULE,
-	.ioctl		= gps_brcm4750_ioctl,
+	.unlocked_ioctl		= gps_brcm4750_ioctl,
 };
 
 static struct miscdevice gps_gpio_miscdev = {