Commit 7c67c053 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: wlan_deinit_locks: change argument wilc with net_device

This patch changes argument wilc with net_device and use netdev private data
member wilc instead of g_linux_wlan.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5382219
...@@ -95,7 +95,7 @@ static struct notifier_block g_dev_notifier = { ...@@ -95,7 +95,7 @@ static struct notifier_block g_dev_notifier = {
*/ */
static struct semaphore close_exit_sync; static struct semaphore close_exit_sync;
static int wlan_deinit_locks(struct wilc *nic); static int wlan_deinit_locks(struct net_device *dev);
static void wlan_deinitialize_threads(struct wilc *nic); static void wlan_deinitialize_threads(struct wilc *nic);
extern void WILC_WFI_monitor_rx(u8 *buff, u32 size); extern void WILC_WFI_monitor_rx(u8 *buff, u32 size);
extern void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size); extern void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size);
...@@ -940,7 +940,7 @@ void wilc1000_wlan_deinit(struct net_device *dev) ...@@ -940,7 +940,7 @@ void wilc1000_wlan_deinit(struct net_device *dev)
/*De-Initialize locks*/ /*De-Initialize locks*/
PRINT_D(INIT_DBG, "Deinitializing Locks\n"); PRINT_D(INIT_DBG, "Deinitializing Locks\n");
wlan_deinit_locks(wl); wlan_deinit_locks(dev);
/* announce that wilc1000 is not initialized */ /* announce that wilc1000 is not initialized */
wl->initialized = false; wl->initialized = false;
...@@ -978,15 +978,21 @@ int wlan_init_locks(struct net_device *dev) ...@@ -978,15 +978,21 @@ int wlan_init_locks(struct net_device *dev)
return 0; return 0;
} }
static int wlan_deinit_locks(struct wilc *nic) static int wlan_deinit_locks(struct net_device *dev)
{ {
perInterface_wlan_t *nic;
struct wilc *wilc;
nic = netdev_priv(dev);
wilc = nic->wilc;
PRINT_D(INIT_DBG, "De-Initializing Locks\n"); PRINT_D(INIT_DBG, "De-Initializing Locks\n");
if (&g_linux_wlan->hif_cs != NULL) if (&wilc->hif_cs != NULL)
mutex_destroy(&g_linux_wlan->hif_cs); mutex_destroy(&wilc->hif_cs);
if (&g_linux_wlan->rxq_cs != NULL) if (&wilc->rxq_cs != NULL)
mutex_destroy(&g_linux_wlan->rxq_cs); mutex_destroy(&wilc->rxq_cs);
return 0; return 0;
} }
...@@ -1169,7 +1175,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) ...@@ -1169,7 +1175,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
_fail_wilc_wlan_: _fail_wilc_wlan_:
wilc_wlan_cleanup(); wilc_wlan_cleanup();
_fail_locks_: _fail_locks_:
wlan_deinit_locks(wl); wlan_deinit_locks(dev);
PRINT_ER("WLAN Iinitialization FAILED\n"); PRINT_ER("WLAN Iinitialization FAILED\n");
} else { } else {
PRINT_D(INIT_DBG, "wilc1000 already initialized\n"); PRINT_D(INIT_DBG, "wilc1000 already initialized\n");
......
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