From: Glen Lee <glen.lee@xxxxxxxxx> This patch removes do-nothing ifdef, else statement and add ifdef WILC_SDIO for disable_sdio_interrupt(). Signed-off-by: Glen Lee <glen.lee@xxxxxxxxx> Signed-off-by: Tony Cho <tony.cho@xxxxxxxxx> --- drivers/staging/wilc1000/linux_wlan.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index c7034648..7f4ee80 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -982,17 +982,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); -- 1.9.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel