wl1271: Added IO reset and init functions

Added reset and init functions to IO layer of the driver.

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: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/wl12xx/wl1271_io.c b/drivers/net/wireless/wl12xx/wl1271_io.c
index 00f98bdc48f7edd50b6d83fec367de27b33539af..5cd94d5666c29ac1db5211fbb7af92c526133c25 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_io.c
+++ b/drivers/net/wireless/wl12xx/wl1271_io.c
@@ -115,6 +115,16 @@ int wl1271_set_partition(struct wl1271 *wl,
        return 0;
 }
 
+void wl1271_io_reset(struct wl1271 *wl)
+{
+       wl1271_spi_reset(wl);
+}
+
+void wl1271_io_init(struct wl1271 *wl)
+{
+       wl1271_spi_init(wl);
+}
+
 void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
                      size_t len, bool fixed)
 {

diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/wl1271_io.h
index 859d571dc413016bea4c0a6d4120f0082dc98ad0..fa9a0b35788f2e08dfe238a1e07fb852f2f01f0f 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_io.h
+++ b/drivers/net/wireless/wl12xx/wl1271_io.h
@@ -27,6 +27,8 @@
 
 struct wl1271;
 
+void wl1271_io_reset(struct wl1271 *wl);
+void wl1271_io_init(struct wl1271 *wl);
 
 /* Raw target IO, address is not translated */
 void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 46968958aeff4ecddeba89ea551ba9e48457d939..66fb9a0a8efaa3b7eef76e5d803063715b98a622 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -648,8 +648,8 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
        msleep(WL1271_PRE_POWER_ON_SLEEP);
        wl1271_power_on(wl);
        msleep(WL1271_POWER_ON_SLEEP);
-       wl1271_spi_reset(wl);
-       wl1271_spi_init(wl);
+       wl1271_io_reset(wl);
+       wl1271_io_init(wl);
 
        /* We don't need a real memory partition here, because we only want
         * to use the registers at this point. */