Commit 2de7cbec authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

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: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07320b6b
...@@ -927,7 +927,7 @@ void wilc1000_wlan_deinit(struct net_device *dev) ...@@ -927,7 +927,7 @@ void wilc1000_wlan_deinit(struct net_device *dev)
wilc_wlan_stop(); wilc_wlan_stop();
PRINT_D(INIT_DBG, "Deinitializing WILC Wlan\n"); 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 WILC_SDIO) && (!defined WILC_SDIO_IRQ_GPIO)
#if defined(PLAT_ALLWINNER_A20) || defined(PLAT_ALLWINNER_A23) || defined(PLAT_ALLWINNER_A31) #if defined(PLAT_ALLWINNER_A20) || defined(PLAT_ALLWINNER_A23) || defined(PLAT_ALLWINNER_A31)
PRINT_D(INIT_DBG, "Disabling IRQ 2\n"); PRINT_D(INIT_DBG, "Disabling IRQ 2\n");
...@@ -1178,7 +1178,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1178,7 +1178,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
#endif #endif
wlan_deinitialize_threads(dev); wlan_deinitialize_threads(dev);
_fail_wilc_wlan_: _fail_wilc_wlan_:
wilc_wlan_cleanup(); wilc_wlan_cleanup(dev);
_fail_locks_: _fail_locks_:
wlan_deinit_locks(dev); wlan_deinit_locks(dev);
PRINT_ER("WLAN Iinitialization FAILED\n"); PRINT_ER("WLAN Iinitialization FAILED\n");
......
...@@ -1647,7 +1647,7 @@ int wilc_wlan_stop(void) ...@@ -1647,7 +1647,7 @@ int wilc_wlan_stop(void)
return ret; return ret;
} }
void wilc_wlan_cleanup(void) void wilc_wlan_cleanup(struct net_device *dev)
{ {
wilc_wlan_dev_t *p = &g_wlan; wilc_wlan_dev_t *p = &g_wlan;
struct txq_entry_t *tqe; struct txq_entry_t *tqe;
......
...@@ -302,7 +302,7 @@ int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, ...@@ -302,7 +302,7 @@ int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,
wilc_tx_complete_func_t func); wilc_tx_complete_func_t func);
int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount); int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount);
void wilc_handle_isr(void *wilc); 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 wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
int commit, u32 drvHandler); int commit, u32 drvHandler);
int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler); int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment