diff options
author | Glen Lee | 2015-10-27 10:27:40 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-10-29 00:08:47 +0100 |
commit | 50b929e08ee09ceb6ffa8416af818bed358718f6 (patch) | |
tree | 23cb44e0389158012ce88409bcad7d8d58aefc99 /drivers/staging/wilc1000/linux_wlan_sdio.c | |
parent | staging: wilc1000: deinit_irq: use wilc instead of g_linux_wlan (diff) | |
download | kernel-qcow2-linux-50b929e08ee09ceb6ffa8416af818bed358718f6.tar.gz kernel-qcow2-linux-50b929e08ee09ceb6ffa8416af818bed358718f6.tar.xz kernel-qcow2-linux-50b929e08ee09ceb6ffa8416af818bed358718f6.zip |
staging: wilc1000: wilc_handle_isr: add argument wilc to wilc_handle_isr
This patch add new argument wilc to wilc_handle_isr and pass wilc to
the function.
It is void type for now because wilc_wlan.c was implemented platform
independently at the beginning (linux_wlan.c is implementation of LINUX part),
so the header file which defines struct wilc cannot be included at this moment,
but this driver is dedicated to LINUX so wilc_wlan.c and linux_wlan.c will be
merged. After that, this void type will be changed with struct wilc as well as
other functions which are using void type in wilc_wlan.h.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/linux_wlan_sdio.c')
-rw-r--r-- | drivers/staging/wilc1000/linux_wlan_sdio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c b/drivers/staging/wilc1000/linux_wlan_sdio.c index 1f8d8743f376..4aff953a88f1 100644 --- a/drivers/staging/wilc1000/linux_wlan_sdio.c +++ b/drivers/staging/wilc1000/linux_wlan_sdio.c @@ -27,7 +27,6 @@ struct wilc_sdio { }; struct sdio_func *local_sdio_func; -extern void wilc_handle_isr(void); static unsigned int sdio_default_speed; @@ -42,9 +41,13 @@ static const struct sdio_device_id wilc_sdio_ids[] = { static void wilc_sdio_interrupt(struct sdio_func *func) { + struct wilc_sdio *wl_sdio; + + wl_sdio = sdio_get_drvdata(func); + #ifndef WILC_SDIO_IRQ_GPIO sdio_release_host(func); - wilc_handle_isr(); + wilc_handle_isr(wl_sdio->wilc); sdio_claim_host(func); #endif } |