clean warning for bt and rfkill

diff --git a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
index e263bbbaf1f2a6699a20d610351193e13bdc1ca3..74dd152ae0b301ee283b2c89c907666276b804e4 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c
@@ -139,13 +139,13 @@ static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev)
 #ifdef CONFIG_BT_HCIBCM4325
 int bcm4325_sleep(int bSleep)
 {
-//     printk("*************bt enter sleep***************\n");
+    //printk("*************bt enter sleep***************\n");
     if (bSleep)
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_LOW);   //low represent bt device may enter sleep  
     else
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_HIGH);  //high represent bt device must be awake 
-
-       //printk("sleep=%d\n",bSleep);
+    //printk("sleep=%d\n",bSleep);
+    return 0;
 }
 #endif
   

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
index 41e34922c3868db6a2595b271076b75ab9b99f81..6f01609c4d56314e8fb7958c6a8ebd14206dbae6 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
@@ -139,13 +139,13 @@ static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev)
 #ifdef CONFIG_BT_HCIBCM4325
 int bcm4325_sleep(int bSleep)
 {
-//     printk("*************bt enter sleep***************\n");
+    //printk("*************bt enter sleep***************\n");
     if (bSleep)
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_LOW);   //low represent bt device may enter sleep  
     else
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_HIGH);  //high represent bt device must be awake 
-
-       //printk("sleep=%d\n",bSleep);
+    //printk("sleep=%d\n",bSleep);
+    return 0;
 }
 #endif
   

diff --git a/arch/arm/mach-rk29/board-rk29-td8801_v2-rfkill.c b/arch/arm/mach-rk29/board-rk29-td8801_v2-rfkill.c
index d5a5d01e1aa00c062580017c2616ffc52ac87faf..a0a9893c20afcf132ee4f2134a866334bbeb8531 100644 (file)
--- a/arch/arm/mach-rk29/board-rk29-td8801_v2-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-td8801_v2-rfkill.c
@@ -139,13 +139,13 @@ static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev)
 #ifdef CONFIG_BT_HCIBCM4325
 int bcm4325_sleep(int bSleep)
 {
-//     printk("*************bt enter sleep***************\n");
+    //printk("*************bt enter sleep***************\n");
     if (bSleep)
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_LOW);   //low represent bt device may enter sleep
     else
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_HIGH);  //high represent bt device must be awake
-
-       //printk("sleep=%d\n",bSleep);
+    //printk("sleep=%d\n",bSleep);
+    return 0;
 }
 #endif
 

diff --git a/arch/arm/mach-rk29/board-rk29-z5-rfkill.c b/arch/arm/mach-rk29/board-rk29-z5-rfkill.c
index 89528561c9c72e84b07b7e34d05f82c102b1e427..9d187edf9b1ba6ac436bb28f13f47e592162953d 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-z5-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-z5-rfkill.c
@@ -139,13 +139,13 @@ static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev)
 #ifdef CONFIG_BT_HCIBCM4325
 int bcm4325_sleep(int bSleep)
 {
-//     printk("*************bt enter sleep***************\n");
+    //printk("*************bt enter sleep***************\n");
     if (bSleep)
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_LOW);   //low represent bt device may enter sleep  
     else
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_HIGH);  //high represent bt device must be awake 
-
-       //printk("sleep=%d\n",bSleep);
+    //printk("sleep=%d\n",bSleep);
+    return 0;
 }
 #endif
   

diff --git a/arch/arm/mach-rk29/board-rk29phonepadsdk-rfkill.c b/arch/arm/mach-rk29/board-rk29phonepadsdk-rfkill.c
index 8f9d99d2f80c2b3948e75ffd62d1316a6779e697..cc19e14d950d979d09e162c7af3648599ce16566 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29phonepadsdk-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk-rfkill.c
@@ -119,13 +119,13 @@ static irqreturn_t bcm4329_wake_host_irq(int irq, void *dev)
 #ifdef CONFIG_BT_HCIBCM4325
 int bcm4325_sleep(int bSleep)
 {
-//     printk("*************bt enter sleep***************\n");
+    //printk("*************bt enter sleep***************\n");
     if (bSleep)
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_LOW);   //low represent bt device may enter sleep  
     else
     gpio_set_value(BT_GPIO_WAKE_UP, GPIO_HIGH);  //high represent bt device must be awake 
-
-       //printk("sleep=%d\n",bSleep);
+    //printk("sleep=%d\n",bSleep);
+    return 0;
 }
 #endif
   

diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 38f6fe6c5ca23283da46b9b8ccc6de133e09444d..74be11df78331135a268353b1e373952d6154532 100755 (executable)
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -146,7 +146,7 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len)
        }
 #ifdef CONFIG_BT_HCIBCM4325  
        bcm4325_sleep(1);
-#endif;        
+#endif 
        h4->rx_state = H4_W4_PACKET_TYPE;
        h4->rx_skb   = NULL;
        h4->rx_count = 0;

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 93e278fe9c8e7ea73431f082455406d259736fed..22c0cca19a755d95edd4181dd7bcea3475a1e25f 100755 (executable)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -140,7 +140,7 @@ restart:
 /*added by Barry,for broadcom 4325*/
 #ifdef CONFIG_BT_HCIBCM4325  
        bcm4325_sleep(0);
-#endif;
+#endif
        while ((skb = hci_uart_dequeue(hu))) {
                int len;