Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / brcm80211 / brcmfmac / dhd_custom_gpio.c

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index f647034f36d689348024a48d4e0daf673fc416f4..c3f18bb3b27c70f1204bc3a2af79e70dd210253a 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linuxver.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 
@@ -24,8 +24,8 @@
 #include <wlioctl.h>
 #include <wl_iw.h>
 
-#define WL_ERROR(x) printf x
-#define WL_TRACE(x)
+#define WL_ERROR(fmt, args...) printk(fmt, ##args)
+#define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
 
 #ifdef CUSTOMER_HW
 extern void bcm_wlan_power_off(int);
@@ -67,13 +67,13 @@ int dhd_customer_oob_irq_map(unsigned long *irq_flags_ptr)
 #endif
 
        if (dhd_oob_gpio_num < 0) {
-               WL_ERROR(("%s: ERROR customer specific Host GPIO is NOT defined\n",
-                       __func__));
+               WL_ERROR("%s: ERROR customer specific Host GPIO is NOT defined\n",
+                        __func__);
                return dhd_oob_gpio_num;
        }
 
-       WL_ERROR(("%s: customer specific Host GPIO number is (%d)\n",
-                 __func__, dhd_oob_gpio_num));
+       WL_ERROR("%s: customer specific Host GPIO number is (%d)\n",
+                __func__, dhd_oob_gpio_num);
 
 #if defined CUSTOMER_HW
        host_oob_irq = MSM_GPIO_TO_INT(dhd_oob_gpio_num);
@@ -93,40 +93,40 @@ void dhd_customer_gpio_wlan_ctrl(int onoff)
 {
        switch (onoff) {
        case WLAN_RESET_OFF:
-               WL_TRACE(("%s: call customer specific GPIO to insert WLAN RESET\n",
-                       __func__));
+               WL_TRACE("%s: call customer specific GPIO to insert WLAN RESET\n",
+                        __func__);
 #ifdef CUSTOMER_HW
                bcm_wlan_power_off(2);
 #endif                         /* CUSTOMER_HW */
 #ifdef CUSTOMER_HW2
                wifi_set_power(0, 0);
 #endif
-               WL_ERROR(("=========== WLAN placed in RESET ========\n"));
+               WL_ERROR("=========== WLAN placed in RESET ========\n");
                break;
 
        case WLAN_RESET_ON:
-               WL_TRACE(("%s: callc customer specific GPIO to remove WLAN RESET\n",
-                       __func__));
+               WL_TRACE("%s: callc customer specific GPIO to remove WLAN RESET\n",
+                        __func__);
 #ifdef CUSTOMER_HW
                bcm_wlan_power_on(2);
 #endif                         /* CUSTOMER_HW */
 #ifdef CUSTOMER_HW2
                wifi_set_power(1, 0);
 #endif
-               WL_ERROR(("=========== WLAN going back to live  ========\n"));
+               WL_ERROR("=========== WLAN going back to live  ========\n");
                break;
 
        case WLAN_POWER_OFF:
-               WL_TRACE(("%s: call customer specific GPIO to turn off WL_REG_ON\n",
-                       __func__));
+               WL_TRACE("%s: call customer specific GPIO to turn off WL_REG_ON\n",
+                        __func__);
 #ifdef CUSTOMER_HW
                bcm_wlan_power_off(1);
 #endif                         /* CUSTOMER_HW */
                break;
 
        case WLAN_POWER_ON:
-               WL_TRACE(("%s: call customer specific GPIO to turn on WL_REG_ON\n",
-                       __func__));
+               WL_TRACE("%s: call customer specific GPIO to turn on WL_REG_ON\n",
+                        __func__);
 #ifdef CUSTOMER_HW
                bcm_wlan_power_on(1);
 #endif                         /* CUSTOMER_HW */
@@ -140,7 +140,7 @@ void dhd_customer_gpio_wlan_ctrl(int onoff)
 /* Function to get custom MAC address */
 int dhd_custom_get_mac_address(unsigned char *buf)
 {
-       WL_TRACE(("%s Enter\n", __func__));
+       WL_TRACE("%s Enter\n", __func__);
        if (!buf)
                return -EINVAL;