From: gwl <gwl@rock-chips.com>
Date: Sat, 29 Mar 2014 02:06:02 +0000 (+0800)
Subject: Wifi:BT: fix rfkill compile warning.
X-Git-Tag: firefly_0821_release~5726
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=336ef079e18e45100a00cd63bf35697b7f2f99ba;p=firefly-linux-kernel-4.4.55.git

Wifi:BT: fix rfkill compile warning.
---

diff --git a/net/rfkill/rfkill-bt.c b/net/rfkill/rfkill-bt.c
index 04dd9538bbb3..90f7918d4480 100755
--- a/net/rfkill/rfkill-bt.c
+++ b/net/rfkill/rfkill-bt.c
@@ -31,6 +31,7 @@
 #include <linux/proc_fs.h>
 #include <linux/uaccess.h>
 #include <linux/gpio.h>
+#include <linux/fs.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <uapi/linux/rfkill.h>
 #ifdef CONFIG_OF
@@ -384,28 +385,26 @@ static const struct rfkill_ops rfkill_rk_ops = {
 
 static struct proc_dir_entry *bluetooth_dir, *sleep_dir;
 
-static int bluesleep_read_proc_lpm(char *page, char **start, off_t offset,
-					int count, int *eof, void *data)
+static int bluesleep_read_proc_lpm(struct file *file, char __user *buffer, 
+                    size_t count, loff_t *data)
 {
-    *eof = 1;
-    return sprintf(page, "unsupported to read\n");
+    return sprintf(buffer, "unsupported to read\n");
 }
 
-static int bluesleep_write_proc_lpm(struct file *file, const char *buffer,
-					unsigned long count, void *data)
+static int bluesleep_write_proc_lpm(struct file *file, const char __user *buffer, 
+                    size_t count, loff_t *data)
 {
     return count;
 }
 
-static int bluesleep_read_proc_btwrite(char *page, char **start, off_t offset,
-					int count, int *eof, void *data)
+static int bluesleep_read_proc_btwrite(struct file *file, char __user *buffer, 
+                    size_t count, loff_t *data)
 {
-    *eof = 1;
-    return sprintf(page, "unsupported to read\n");
+    return sprintf(buffer, "unsupported to read\n");
 }
 
-static int bluesleep_write_proc_btwrite(struct file *file, const char *buffer,
-					unsigned long count, void *data)
+static int bluesleep_write_proc_btwrite(struct file *file, const char __user *buffer, 
+                    size_t count, loff_t *data)
 {
     char b;
 
diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c
index 227d0dfb6837..6a3bb3bcdc61 100755
--- a/net/rfkill/rfkill-wlan.c
+++ b/net/rfkill/rfkill-wlan.c
@@ -269,6 +269,7 @@ EXPORT_SYMBOL(rockchip_wifi_power);
  * Wifi Sdio Detect Func
  *
  *************************************************************************/
+#include <linux/mmc/host.h>
 extern int mmc_host_rescan(struct mmc_host *host, int val);
 int rockchip_wifi_set_carddetect(int val)
 {