projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a87d792
)
staging: wilc1000: remove do-nothing ifdef statement
author
Glen Lee
<
[email protected]
>
Thu, 17 Sep 2015 08:47:25 +0000
(17:47 +0900)
committer
Greg Kroah-Hartman
<
[email protected]
>
Sat, 19 Sep 2015 02:48:30 +0000
(19:48 -0700)
This patch removes do-nothing ifdef, else statement and add ifdef WILC_SDIO
for disable_sdio_interrupt().
Signed-off-by: Glen Lee <
[email protected]
>
Signed-off-by: Tony Cho <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/staging/wilc1000/linux_wlan.c
patch
|
blob
|
history
diff --git
a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index d3d785e5b31707989808df384fa4b4cb4f215f32..6791012858c92998c7724611aaaaccff7d77a3e4 100644
(file)
--- 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);