diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-27 18:27:54 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:11:23 +0900 |
| commit | 2de7cbecef34e8e4b83a6771aebe87b4f6cac0c3 (patch) | |
| tree | b449aa8740c6323c76861975270ec821b3aa6c58 /drivers/staging/wilc1000 | |
| parent | 07320b6bc3ea5a75b6a0c7a36bd8dddbd746225c (diff) | |
| download | lwn-2de7cbecef34e8e4b83a6771aebe87b4f6cac0c3.tar.gz lwn-2de7cbecef34e8e4b83a6771aebe87b4f6cac0c3.zip | |
staging: wilc1000: wilc_wlan_cleanup: add new argument struct net_device
This patch adds new function argument net_device and pass dev to the functions.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index bd9f71584163..d193af871129 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -927,7 +927,7 @@ void wilc1000_wlan_deinit(struct net_device *dev) wilc_wlan_stop(); PRINT_D(INIT_DBG, "Deinitializing WILC Wlan\n"); - wilc_wlan_cleanup(); + wilc_wlan_cleanup(dev); #if (defined WILC_SDIO) && (!defined WILC_SDIO_IRQ_GPIO) #if defined(PLAT_ALLWINNER_A20) || defined(PLAT_ALLWINNER_A23) || defined(PLAT_ALLWINNER_A31) PRINT_D(INIT_DBG, "Disabling IRQ 2\n"); @@ -1178,7 +1178,7 @@ _fail_irq_init_: #endif wlan_deinitialize_threads(dev); _fail_wilc_wlan_: - wilc_wlan_cleanup(); + wilc_wlan_cleanup(dev); _fail_locks_: wlan_deinit_locks(dev); PRINT_ER("WLAN Iinitialization FAILED\n"); diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index babd941f0eff..747374291bdd 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -1647,7 +1647,7 @@ int wilc_wlan_stop(void) return ret; } -void wilc_wlan_cleanup(void) +void wilc_wlan_cleanup(struct net_device *dev) { wilc_wlan_dev_t *p = &g_wlan; struct txq_entry_t *tqe; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 79b35e670c52..d0b244848cc4 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -302,7 +302,7 @@ int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, wilc_tx_complete_func_t func); int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount); void wilc_handle_isr(void *wilc); -void wilc_wlan_cleanup(void); +void wilc_wlan_cleanup(struct net_device *dev); int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, int commit, u32 drvHandler); int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler); |