FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-04 10:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: wilc1000: remove pointer variable of g_linux_wlan->txq_event

Browse Source 
Remove variable txq_wait and txq_wait_event which are pointer varialbe
of g_linux_wlan->txq_event. No need to have extra pointer varialbe. Just use
g_linux_wlan->txq_event. Remove os_context.txq_wait_event, txq_wait 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:14:58 +09:00 committed by Greg Kroah-Hartman
parent 645db60e47
commit 5cd6363385
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View File

@ -1062,8 +1062,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
nwi->os_context.txq_add_to_head_critical_section = (void *)&g_linux_wlan->txq_add_to_head_cs; nwi->os_context.txq_add_to_head_critical_section = (void *)&g_linux_wlan->txq_add_to_head_cs;
nwi->os_context.txq_wait_event = (void *)&g_linux_wlan->txq_event;
#if defined(MEMORY_STATIC) #if defined(MEMORY_STATIC)
nwi->os_context.rx_buffer_size = LINUX_RX_SIZE; nwi->os_context.rx_buffer_size = LINUX_RX_SIZE;
#endif #endif

8
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -75,7 +75,6 @@ typedef struct {
struct txq_entry_t *txq_head; struct txq_entry_t *txq_head;
struct txq_entry_t *txq_tail; struct txq_entry_t *txq_tail;
int txq_entries; int txq_entries;
void *txq_wait;
int txq_exit; int txq_exit;
/** /**
@ -223,7 +222,7 @@ static void wilc_wlan_txq_add_to_tail(struct txq_entry_t *tqe)
**/ **/
PRINT_D(TX_DBG, "Wake the txq_handling\n"); PRINT_D(TX_DBG, "Wake the txq_handling\n");
up(p->txq_wait); up(&g_linux_wlan->txq_event);
} }
static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe) static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
@ -256,7 +255,7 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
/** /**
* wake up TX queue * wake up TX queue
**/ **/
up(p->txq_wait); up(&g_linux_wlan->txq_event);
PRINT_D(TX_DBG, "Wake up the txq_handler\n"); PRINT_D(TX_DBG, "Wake up the txq_handler\n");
return 0; return 0;
@ -458,7 +457,7 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(void)
while (Dropped > 0) { while (Dropped > 0) {
/*consume the semaphore count of the removed packet*/ /*consume the semaphore count of the removed packet*/
p->os_func.os_wait(p->txq_wait, 1); p->os_func.os_wait(&g_linux_wlan->txq_event, 1);
Dropped--; Dropped--;
} }
@ -1973,7 +1972,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
g_wlan.txq_add_to_head_lock = inp->os_context.txq_add_to_head_critical_section; g_wlan.txq_add_to_head_lock = inp->os_context.txq_add_to_head_critical_section;
g_wlan.txq_wait = inp->os_context.txq_wait_event;
g_wlan.cfg_wait = inp->os_context.cfg_wait_event; g_wlan.cfg_wait = inp->os_context.cfg_wait_event;
g_wlan.tx_buffer_size = inp->os_context.tx_buffer_size; g_wlan.tx_buffer_size = inp->os_context.tx_buffer_size;
#if defined (MEMORY_STATIC) #if defined (MEMORY_STATIC)

2
drivers/staging/wilc1000/wilc_wlan_if.h
View File

@ -115,8 +115,6 @@ typedef struct {
void *txq_add_to_head_critical_section; void *txq_add_to_head_critical_section;
void *txq_wait_event;
#if defined(MEMORY_STATIC) #if defined(MEMORY_STATIC)
u32 rx_buffer_size; u32 rx_buffer_size;
#endif #endif