diff options
| author | Glen Lee | 2015-09-17 10:47:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-09-19 04:48:30 +0200 |
| commit | d59177cb70bbfff07408de0ceed8dcdd91208b5e (patch) | |
| tree | 2410f0d761663bb864de74f306971d925c188bb0 | |
| parent | staging: wilc1000: remove define RX_BH_TYPE (diff) | |
| download | kernel-qcow2-linux-d59177cb70bbfff07408de0ceed8dcdd91208b5e.tar.gz kernel-qcow2-linux-d59177cb70bbfff07408de0ceed8dcdd91208b5e.tar.xz kernel-qcow2-linux-d59177cb70bbfff07408de0ceed8dcdd91208b5e.zip | |
staging: wilc1000: remove do-nothing ifdef statement
This patch removes do-nothing ifdef, else statement and add ifdef WILC_SDIO
for disable_sdio_interrupt().
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d3d785e5b317..6791012858c9 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -979,17 +979,11 @@ void wilc1000_wlan_deinit(linux_wlan_t *nic) #endif PRINT_D(INIT_DBG, "Disabling IRQ\n"); - #if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO) - #else - #if defined(PLAT_ALLWINNER_A20) || defined(PLAT_ALLWINNER_A23) || defined(PLAT_ALLWINNER_A31) - - #else +#ifdef WILC_SDIO mutex_lock(&g_linux_wlan->hif_cs); disable_sdio_interrupt(); mutex_unlock(&g_linux_wlan->hif_cs); - #endif - #endif - +#endif if (&g_linux_wlan->txq_event != NULL) up(&g_linux_wlan->txq_event); |