wl1271: Added functions to enable/disable interrupt handling

Added/moved enable and disable interrupt handling functions.

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_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c
index 2be76ee42bb9b2a4aeda9a40a5ac46153fa97fe0..7d6d2e6c467f2b4ac1e5fbbe126a5a8e33ec735d 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1271_boot.c
@@ -299,7 +299,7 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
 
 static void wl1271_boot_enable_interrupts(struct wl1271 *wl)
 {
-       enable_irq(wl->irq);
+       wl1271_enable_interrupts(wl);
        wl1271_write32(wl, ACX_REG_INTERRUPT_MASK,
                       WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));
        wl1271_write32(wl, HI_CFG, HI_CFG_DEF_VAL);

diff --git a/drivers/net/wireless/wl12xx/wl1271_io.c b/drivers/net/wireless/wl12xx/wl1271_io.c
index 5cd94d5666c29ac1db5211fbb7af92c526133c25..b825cfa30ecfa2454a95c75a4495bfdb8b889b56 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_io.c
+++ b/drivers/net/wireless/wl12xx/wl1271_io.c
@@ -31,6 +31,16 @@
 #include "wl1271_spi.h"
 #include "wl1271_io.h"
 
+void wl1271_disable_interrupts(struct wl1271 *wl)
+{
+       wl1271_spi_disable_interrupts(wl);
+}
+
+void wl1271_enable_interrupts(struct wl1271 *wl)
+{
+       wl1271_spi_enable_interrupts(wl);
+}
+
 static int wl1271_translate_addr(struct wl1271 *wl, int addr)
 {
        /*

diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/wl1271_io.h
index 38fce4caf4a1cc0dce06abd74f5efb14d5182936..c8b09718e18529fc6ad4ac57b3c5c618bb92b806 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_io.h
+++ b/drivers/net/wireless/wl12xx/wl1271_io.h
@@ -27,6 +27,9 @@
 
 struct wl1271;
 
+void wl1271_disable_interrupts(struct wl1271 *wl);
+void wl1271_enable_interrupts(struct wl1271 *wl);
+
 void wl1271_io_reset(struct wl1271 *wl);
 void wl1271_io_init(struct wl1271 *wl);
 

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 66319aabf26324ff3a29c5751dfd4f65e9ab192a..18347c3a5e19d1b8724dcd2c36231b537e5fdf84 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -360,11 +360,6 @@ static int wl1271_plt_init(struct wl1271 *wl)
        return ret;
 }
 
-static void wl1271_disable_interrupts(struct wl1271 *wl)
-{
-       disable_irq(wl->irq);
-}
-
 static void wl1271_power_off(struct wl1271 *wl)
 {
        wl->set_power(false);

diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
index c26726a06237d2b745fd1716528bf02d2068866f..b422c9fdcd22691a72058b2bfcdc65114ab5626d 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -34,6 +34,16 @@
 #include "wl1271_io.h"
 
 
+void wl1271_spi_disable_interrupts(struct wl1271 *wl)
+{
+       disable_irq(wl->irq);
+}
+
+void wl1271_spi_enable_interrupts(struct wl1271 *wl)
+{
+       enable_irq(wl->irq);
+}
+
 void wl1271_spi_reset(struct wl1271 *wl)
 {
        u8 *cmd;

diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.h b/drivers/net/wireless/wl12xx/wl1271_spi.h
index a803596dad4ae4f552e80912bd9f3d009c2b4ee4..86ff161ef243d33269adf728ace919af685cce93 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_spi.h
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.h
@@ -84,6 +84,9 @@
 #define OCP_STATUS_REQ_FAILED 0x20000
 #define OCP_STATUS_RESP_ERROR 0x30000
 
+void wl1271_spi_disable_interrupts(struct wl1271 *wl);
+void wl1271_spi_enable_interrupts(struct wl1271 *wl);
+
 /* Raw target IO, address is not translated */
 void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,
                      size_t len, bool fixed);