wl1271: Added DEBUG_SDIO flag

Added separate flag for SDIO debugging. Previously it has used
DEBUG_SPI flag. This patch also includes couple indentation fixes.

Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h
index 23a0c7e22939d8c147b791ba7f48f99d182dbe43..4e608067253e311a7279c1e474e190b7d3f88ce2 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl1271.h
@@ -53,6 +53,7 @@ enum {
        DEBUG_MAC80211  = BIT(11),
        DEBUG_CMD       = BIT(12),
        DEBUG_ACX       = BIT(13),
+       DEBUG_SDIO      = BIT(14),
        DEBUG_ALL       = ~0,
 };
 

diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index d9183b64e723481dc1eaf9a423ec2c7a358b54e2..0478919138d47f3611ab8ee7d824a56be8ea24df 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -102,14 +102,14 @@ static void wl1271_sdio_init(struct wl1271 *wl)
 }
 
 static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
-                        size_t len, bool fixed)
+                                size_t len, bool fixed)
 {
        int ret;
        struct sdio_func *func = wl_to_func(wl);
 
        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                ((u8 *)buf)[0] = sdio_f0_readb(func, addr, &ret);
-               wl1271_debug(DEBUG_SPI, "sdio read 52 addr 0x%x, byte 0x%02x",
+               wl1271_debug(DEBUG_SDIO, "sdio read 52 addr 0x%x, byte 0x%02x",
                             addr, ((u8 *)buf)[0]);
        } else {
                if (fixed)
@@ -117,9 +117,9 @@ static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
                else
                        ret = sdio_memcpy_fromio(func, buf, addr, len);
 
-               wl1271_debug(DEBUG_SPI, "sdio read 53 addr 0x%x, %d bytes",
+               wl1271_debug(DEBUG_SDIO, "sdio read 53 addr 0x%x, %d bytes",
                             addr, len);
-               wl1271_dump_ascii(DEBUG_SPI, "data: ", buf, len);
+               wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
        }
 
        if (ret)
@@ -128,19 +128,19 @@ static void wl1271_sdio_raw_read(struct wl1271 *wl, int addr, void *buf,
 }
 
 static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
-                         size_t len, bool fixed)
+                                 size_t len, bool fixed)
 {
        int ret;
        struct sdio_func *func = wl_to_func(wl);
 
        if (unlikely(addr == HW_ACCESS_ELP_CTRL_REG_ADDR)) {
                sdio_f0_writeb(func, ((u8 *)buf)[0], addr, &ret);
-               wl1271_debug(DEBUG_SPI, "sdio write 52 addr 0x%x, byte 0x%02x",
+               wl1271_debug(DEBUG_SDIO, "sdio write 52 addr 0x%x, byte 0x%02x",
                             addr, ((u8 *)buf)[0]);
        } else {
-               wl1271_debug(DEBUG_SPI, "sdio write 53 addr 0x%x, %d bytes",
+               wl1271_debug(DEBUG_SDIO, "sdio write 53 addr 0x%x, %d bytes",
                             addr, len);
-               wl1271_dump_ascii(DEBUG_SPI, "data: ", buf, len);
+               wl1271_dump_ascii(DEBUG_SDIO, "data: ", buf, len);
 
                if (fixed)
                        ret = sdio_writesb(func, addr, buf, len);
@@ -156,6 +156,10 @@ static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable)
 {
        struct sdio_func *func = wl_to_func(wl);
 
+       /* Let the SDIO stack handle wlan_enable control, so we
+        * keep host claimed while wlan is in use to keep wl1271
+        * alive.
+        */
        if (enable) {
                sdio_claim_host(func);
                sdio_enable_func(func);