OSDN Git Service

wl1271: remove warnings in wl1271_sdio_set_power master-2010-09-14
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 14 Sep 2010 20:26:44 +0000 (16:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 14 Sep 2010 20:26:44 +0000 (16:26 -0400)
These were introduced in "wl1271: sdio: claim host only when doing IO"

drivers/net/wireless/wl12xx/wl1271_sdio.c: In function ‘wl1271_sdio_set_power’:
drivers/net/wireless/wl12xx/wl1271_sdio.c:193: warning: ‘return’ with a value, in function returning void
drivers/net/wireless/wl12xx/wl1271_sdio.c:195: warning: ‘return’ with a value, in function returning void
drivers/net/wireless/wl12xx/wl1271_sdio.c:186: warning: unused variable ‘func’

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/wl12xx/wl1271_sdio.c

index b3c3158..b5d9565 100644 (file)
@@ -159,40 +159,34 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, int addr, void *buf,
                wl1271_error("sdio write failed (%d)", ret);
 }
 
-static int wl1271_sdio_power_on(struct wl1271 *wl)
+static void wl1271_sdio_power_on(struct wl1271 *wl)
 {
        struct sdio_func *func = wl_to_func(wl);
 
        sdio_claim_host(func);
        sdio_enable_func(func);
        sdio_release_host(func);
-
-       return 0;
 }
 
-static int wl1271_sdio_power_off(struct wl1271 *wl)
+static void wl1271_sdio_power_off(struct wl1271 *wl)
 {
        struct sdio_func *func = wl_to_func(wl);
 
        sdio_claim_host(func);
        sdio_disable_func(func);
        sdio_release_host(func);
-
-       return 0;
 }
 
 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)
-               return wl1271_sdio_power_on(wl);
+               wl1271_sdio_power_on(wl);
        else
-               return wl1271_sdio_power_off(wl);
+               wl1271_sdio_power_off(wl);
 
 }