diff options
| author | Glen Lee | 2015-10-27 10:27:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-29 00:08:47 +0100 |
| commit | ec5cc75061b4e6250e5dace58f236c1f567b99fd (patch) | |
| tree | 09111ddfcad57e78105e9033d316baee011268c7 /drivers/staging/wilc1000/linux_wlan.c | |
| parent | staging: wilc1000: isr_bh_routine: use wilc instead of g_linux_wlan (diff) | |
| download | kernel-qcow2-linux-ec5cc75061b4e6250e5dace58f236c1f567b99fd.tar.gz kernel-qcow2-linux-ec5cc75061b4e6250e5dace58f236c1f567b99fd.tar.xz kernel-qcow2-linux-ec5cc75061b4e6250e5dace58f236c1f567b99fd.zip | |
staging: wilc1000: deinit_irq: use wilc instead of g_linux_wlan
This patch changes function parameter linux_wlan_t nic with net_dev dev and
use netdev private data member wilc instead of nic and g_linux_wlan.
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.c')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 7d0d7229a231..ac2bc0661b53 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -310,12 +310,18 @@ static int init_irq(struct net_device *dev) } #endif -static void deinit_irq(struct wilc *nic) +static void deinit_irq(struct net_device *dev) { + perInterface_wlan_t *nic; + struct wilc *wilc; + + nic = netdev_priv(dev); + wilc = nic->wilc; + #if (defined WILC_SPI) || (defined WILC_SDIO_IRQ_GPIO) /* Deintialize IRQ */ - if (&nic->dev_irq_num != 0) { - free_irq(nic->dev_irq_num, g_linux_wlan); + if (&wilc->dev_irq_num != 0) { + free_irq(wilc->dev_irq_num, wilc); gpio_free(GPIO_NUM); } @@ -907,7 +913,7 @@ void wilc1000_wlan_deinit(struct net_device *dev) wlan_deinitialize_threads(wl); PRINT_D(INIT_DBG, "Deinitializing IRQ\n"); - deinit_irq(wl); + deinit_irq(dev); wilc_wlan_stop(); @@ -1144,7 +1150,7 @@ _fail_irq_enable_: _fail_irq_init_: #endif #if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO) - deinit_irq(wl); + deinit_irq(dev); #endif wlan_deinitialize_threads(wl); |