diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-09-24 18:15:04 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 02:39:59 +0200 |
| commit | d2bfac009ca2ea75befe5adde9ba8fd46e409c91 (patch) | |
| tree | b92fb935534ccedfdc1d602169aaaaa7cf9ca7f2 | |
| parent | 03eb7266306659080776907498cbfe96f7771d12 (diff) | |
| download | linux-d2bfac009ca2ea75befe5adde9ba8fd46e409c91.tar.bz2 | |
staging: wilc1000: remove mutex txq_cs and it's related codes
mutex txq_cs is never used in the driver. txq_cs, txq_critical_section and
txq_lock have same pointer so just delete them and it's related codes.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 5 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_if.h | 1 |
4 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 519fb167726c..354775066fd1 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1020,7 +1020,6 @@ int wlan_init_locks(linux_wlan_t *p_nic) mutex_init(&g_linux_wlan->hif_cs); mutex_init(&g_linux_wlan->rxq_cs); - mutex_init(&g_linux_wlan->txq_cs); spin_lock_init(&g_linux_wlan->txq_spinlock); sema_init(&g_linux_wlan->txq_add_to_head_cs, 1); @@ -1045,9 +1044,6 @@ static int wlan_deinit_locks(linux_wlan_t *nic) if (&g_linux_wlan->rxq_cs != NULL) mutex_destroy(&g_linux_wlan->rxq_cs); - if (&g_linux_wlan->txq_cs != NULL) - mutex_destroy(&g_linux_wlan->txq_cs); - return 0; } void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) @@ -1056,7 +1052,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) PRINT_D(INIT_DBG, "Linux to Wlan services ...\n"); nwi->os_context.os_private = (void *)nic; - nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs; nwi->os_func.os_wait = linux_wlan_lock_timeout; #ifdef WILC_SDIO diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index b24b9a99b890..e8443064c068 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -169,7 +169,6 @@ typedef struct { u8 u8NoIfcs; tstrInterfaceInfo strInterfaceInfo[NUM_CONCURRENT_IFC]; u8 open_ifcs; - struct mutex txq_cs; struct semaphore txq_add_to_head_cs; spinlock_t txq_spinlock; diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 46f96c332622..aa20f433b011 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -63,7 +63,6 @@ typedef struct { /** * TX queue **/ - void *txq_lock; unsigned long txq_spinlock_flags; @@ -1966,7 +1965,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) **/ memcpy((void *)&g_wlan.os_func, (void *)&inp->os_func, sizeof(wilc_wlan_os_func_t)); memcpy((void *)&g_wlan.io_func, (void *)&inp->io_func, sizeof(wilc_wlan_io_func_t)); - g_wlan.txq_lock = inp->os_context.txq_critical_section; /*** * host interface init **/ diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index e87d7cc38520..0a377e107fa9 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -107,7 +107,6 @@ typedef struct { typedef struct { void *os_private; - void *txq_critical_section; } wilc_wlan_os_context_t; typedef struct { |