staging/wilc1000: remove WILC_SDIO/WILC_SPI macros

The last remaining user of WILC_SDIO macro checks for the correct
time to wait in an interrupt for the PLL to settle. We can
replace this with a runtime check and remove both WILC_SDIO and
WILC_SPI, as we no longer need conditional compilation based on
the hardware type.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index fe480c7..dcba27b 100644 (file)
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -1,7 +1,6 @@
 obj-$(CONFIG_WILC1000) += wilc1000.o
 
-ccflags-$(CONFIG_WILC1000_SDIO) += -DWILC_SDIO -DCOMPLEMENT_BOOT
-ccflags-$(CONFIG_WILC1000_SPI) += -DWILC_SPI
+ccflags-$(CONFIG_WILC1000_SDIO) += -DCOMPLEMENT_BOOT
 
 ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \
                -DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 5e37ec6..f72f976 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1067,7 +1067,10 @@ static void wilc_pllupdate_isr_ext(u32 int_stats)
 
        g_wlan.hif_func.hif_clear_int_ext(PLL_INT_CLR);
 
-       mdelay(WILC_PLL_TO);
+       if (g_wlan.io_type == HIF_SDIO)
+               mdelay(WILC_PLL_TO_SDIO);
+       else
+               mdelay(WILC_PLL_TO_SPI);
 
        while (!(ISWILC1000(wilc_get_chipid(true)) && --trials)) {
                PRINT_D(TX_DBG, "PLL update retrying\n");

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 44a590f..90ef650 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -134,11 +134,8 @@
 #define WILC_CFG_RSP_STATUS    2
 #define WILC_CFG_RSP_SCAN      3
 
-#ifdef WILC_SDIO
-#define WILC_PLL_TO            4
-#else
-#define WILC_PLL_TO            2
-#endif
+#define WILC_PLL_TO_SDIO       4
+#define WILC_PLL_TO_SPI                2
 #define ABORT_INT              BIT(31)
 
 /*******************************************/