misc: gps-gpio-brcm4750: move to unlocked_ioctl
authorErik Gilling <konkers@android.com>
Tue, 31 Aug 2010 01:15:47 +0000 (18:15 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:03:30 +0000 (17:03 -0700)
Change-Id: I527542ef5fdd260036e2a29e697baeea592cde2b

drivers/misc/gps-gpio-brcm4750.c

index 0b53badf7a627ee4a1e853680122dc83379069c0..0706e1cc73ac72cc32b12528de33c2127720a97c 100755 (executable)
@@ -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 = {