diff options
| author | Arnd Bergmann | 2015-11-16 15:05:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-12-18 23:19:20 +0100 |
| commit | c4d139cb8d7dbe67cfbaefa70230d144dbada34c (patch) | |
| tree | b987c077a9d78bb4ab112c38d8e9d868fbbd7bc6 /drivers/staging/wilc1000/wilc_wlan.c | |
| parent | staging/wilc1000: use device pointer for phy creation (diff) | |
| download | kernel-qcow2-linux-c4d139cb8d7dbe67cfbaefa70230d144dbada34c.tar.gz kernel-qcow2-linux-c4d139cb8d7dbe67cfbaefa70230d144dbada34c.tar.xz kernel-qcow2-linux-c4d139cb8d7dbe67cfbaefa70230d144dbada34c.zip | |
staging/wilc1000: get rid of WILC_SDIO_IRQ_GPIO
Whether the SDIO function uses an internal or external interrupt
should not be a compiletime decision but be determined at runtime.
This changes the code to pass a GPIO number from the init code
as early as possible, and leaves just one #ifdef WILC_SDIO_IRQ_GPIO
to preserve the previous behavior.
All other locations that check for the interrupt method are turned
into runtime checks based on the gpio number (>=0) or the interrupt
number (>0).
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wlan.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 2958689a13c6..3d53550149fb 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1174,9 +1174,6 @@ void wilc_handle_isr(void *wilc) wilc_sleeptimer_isr_ext(int_status); if (!(int_status & (ALL_INT_EXT))) { -#ifdef WILC_SDIO - PRINT_D(TX_DBG, ">> UNKNOWN_INTERRUPT - 0x%08x\n", int_status); -#endif wilc_unknown_isr_ext(); } release_bus(RELEASE_ALLOW_SLEEP); @@ -1267,9 +1264,8 @@ int wilc_wlan_start(void) return ret; } reg = 0; -#ifdef WILC_SDIO_IRQ_GPIO - reg |= WILC_HAVE_SDIO_IRQ_GPIO; -#endif + if (p->io_type == HIF_SDIO && wilc_dev->dev_irq_num) + reg |= WILC_HAVE_SDIO_IRQ_GPIO; #ifdef WILC_DISABLE_PMU #else |