diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-20 08:13:53 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-25 01:16:57 (GMT) |
| commit | 38afb390497a0c5f72e936ced1d29ef99a1e9131 (patch) | |
| tree | 970088ab6d4079b9a5a8cfa8d382e792e57ca3c3 | |
| parent | 0fa683b66524805c25b5fec3eb79d963e2f4485d (diff) | |
| download | linux-38afb390497a0c5f72e936ced1d29ef99a1e9131.tar.xz | |
staging: wilc1000: wlan_init_locks: change parameter and use wilc
This patch changes function parameter type wilc with net_device and use netdev
private data member wilc instead of global variable g_linux_wlan.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 39341a8..5fcbfac 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -920,23 +920,28 @@ void wilc1000_wlan_deinit(struct wilc *nic) } } -int wlan_init_locks(struct wilc *p_nic) +int wlan_init_locks(struct net_device *dev) { + perInterface_wlan_t *nic; + struct wilc *wl; + + nic = netdev_priv(dev); + wl = nic->wilc; PRINT_D(INIT_DBG, "Initializing Locks ...\n"); - mutex_init(&g_linux_wlan->hif_cs); - mutex_init(&g_linux_wlan->rxq_cs); + mutex_init(&wl->hif_cs); + mutex_init(&wl->rxq_cs); - spin_lock_init(&g_linux_wlan->txq_spinlock); - sema_init(&g_linux_wlan->txq_add_to_head_cs, 1); + spin_lock_init(&wl->txq_spinlock); + sema_init(&wl->txq_add_to_head_cs, 1); - sema_init(&g_linux_wlan->txq_event, 0); + sema_init(&wl->txq_event, 0); - sema_init(&g_linux_wlan->cfg_event, 0); - sema_init(&g_linux_wlan->sync_event, 0); + sema_init(&wl->cfg_event, 0); + sema_init(&wl->sync_event, 0); - sema_init(&g_linux_wlan->txq_thread_started, 0); + sema_init(&wl->txq_thread_started, 0); return 0; } @@ -1033,7 +1038,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) wl->mac_status = WILC_MAC_STATUS_INIT; wl->close = 0; - wlan_init_locks(wl); + wlan_init_locks(dev); linux_to_wlan(&nwi, wl); |