evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wilc1000: remove mutex txq_cs and it's related codes

Browse source 
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>
This commit is contained in:
Glen Lee 2015-09-24 18:15:04 +09:00 • committed by Greg Kroah-Hartman
parent 03eb726630
commit d2bfac009c
4 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/wilc1000/linux_wlan.c
View file

@ -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->hif_cs);
mutex_init(&g_linux_wlan->rxq_cs); mutex_init(&g_linux_wlan->rxq_cs);
mutex_init(&g_linux_wlan->txq_cs);
spin_lock_init(&g_linux_wlan->txq_spinlock); spin_lock_init(&g_linux_wlan->txq_spinlock);
sema_init(&g_linux_wlan->txq_add_to_head_cs, 1); 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) if (&g_linux_wlan->rxq_cs != NULL)
mutex_destroy(&g_linux_wlan->rxq_cs); mutex_destroy(&g_linux_wlan->rxq_cs);
if (&g_linux_wlan->txq_cs != NULL)
mutex_destroy(&g_linux_wlan->txq_cs);
return 0; return 0;
} }
void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic) 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"); PRINT_D(INIT_DBG, "Linux to Wlan services ...\n");
nwi->os_context.os_private = (void *)nic; 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; nwi->os_func.os_wait = linux_wlan_lock_timeout;
#ifdef WILC_SDIO #ifdef WILC_SDIO

1
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View file

@ -169,7 +169,6 @@ typedef struct {
u8 u8NoIfcs; u8 u8NoIfcs;
tstrInterfaceInfo strInterfaceInfo[NUM_CONCURRENT_IFC]; tstrInterfaceInfo strInterfaceInfo[NUM_CONCURRENT_IFC];
u8 open_ifcs; u8 open_ifcs;
struct mutex txq_cs;
struct semaphore txq_add_to_head_cs; struct semaphore txq_add_to_head_cs;
spinlock_t txq_spinlock; spinlock_t txq_spinlock;

2
drivers/staging/wilc1000/wilc_wlan.c
View file

@ -63,7 +63,6 @@ typedef struct {
/** /**
* TX queue * TX queue
**/ **/
void *txq_lock;
unsigned long txq_spinlock_flags; 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.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)); 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 * host interface init
**/ **/

1
drivers/staging/wilc1000/wilc_wlan_if.h
View file

@ -107,7 +107,6 @@ typedef struct {
typedef struct { typedef struct {
void *os_private; void *os_private;
void *txq_critical_section;
} wilc_wlan_os_context_t; } wilc_wlan_os_context_t;
typedef struct { typedef struct {