public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

staging: wilc1000: deinit_irq: use wilc instead of g_linux_wlan

Browse source 
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>
This commit is contained in:
Glen Lee 2015-10-27 18:27:39 +09:00 • committed by Greg Kroah-Hartman
parent 2e7933d0e7
commit ec5cc75061
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/wilc1000/linux_wlan.c
View file

@ -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);