bluetooth: vflash: fix warning: initialization from incompatible pointer type
author黄涛 <huangtao@rock-chips.com>
Mon, 7 Nov 2011 06:36:09 +0000 (14:36 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 7 Nov 2011 06:36:09 +0000 (14:36 +0800)
drivers/bluetooth/vflash.c

index 44070a74b352c434180a62bb741f48bb7e5a7cc6..e889e823f7cb1367a33ef1a3dd7a539cc944ed71 100755 (executable)
@@ -34,11 +34,10 @@ static struct miscdevice vflash_miscdev;
 extern char GetSNSectorInfo(char * pbuf);\r
 extern unsigned char wlan_mac_addr[6];\r
 \r
-static int vflash_ioctl(struct inode *inode, struct file *file,\r
+static long vflash_ioctl(struct file *file,\r
                                        unsigned int cmd, unsigned long arg)\r
 {\r
        void __user *argp = (void __user *)arg;\r
-    unsigned long n = 0;\r
     \r
     DBG("%s---cmd=0x%x---arg=0x%x\n", __FUNCTION__, cmd, arg);\r
 \r
@@ -49,7 +48,7 @@ static int vflash_ioctl(struct inode *inode, struct file *file,
     {\r
         case READ_BDADDR_FROM_FLASH:\r
         {   \r
-#if CONFIG_WIFI_MAC\r
+#ifdef CONFIG_WIFI_MAC\r
             unsigned char bd_addr[6] = {0};\r
             int i;\r
 \r