From 14569127aecb8980d7b4699597ef85db656b0b92 Mon Sep 17 00:00:00 2001 From: wdc Date: Fri, 13 Jan 2012 09:59:36 +0800 Subject: [PATCH] clean warning for bt and rfkill --- arch/arm/mach-rk29/board-rk29-a22-rfkill.c | 6 +++--- arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c | 6 +++--- arch/arm/mach-rk29/board-rk29-td8801_v2-rfkill.c | 6 +++--- arch/arm/mach-rk29/board-rk29-z5-rfkill.c | 6 +++--- arch/arm/mach-rk29/board-rk29phonepadsdk-rfkill.c | 6 +++--- drivers/bluetooth/hci_h4.c | 2 +- drivers/bluetooth/hci_ldisc.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-a22-rfkill.c b/arch/arm/mach-rk29/board-rk29-a22-rfkill.c index e263bbbaf1f2..74dd152ae0b3 100755 --- 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 41e34922c386..6f01609c4d56 100755 --- 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 d5a5d01e1aa0..a0a9893c20af 100644 --- 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 89528561c9c7..9d187edf9b1b 100755 --- 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 8f9d99d2f80c..cc19e14d950d 100755 --- 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 38f6fe6c5ca2..74be11df7833 100755 --- 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 93e278fe9c8e..22c0cca19a75 100755 --- 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; -- 2.34.1