leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wilc1000: remove pointer variables of txq_add_to_head_cs

Browse Source 
This patch removes txq_add_to_head_critical_section and txq_add_to_head_lock
which are pointer of g_linux_wlan->txq_add_to_head_cs.
Just use g_linux_wlan->txq_add_to_head_cs as argument of function.

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:00 +09:00 committed by Greg Kroah-Hartman
parent 6a3b94f718
commit d5a63a868b
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1059,9 +1059,6 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, linux_wlan_t *nic)
nwi->os_context.os_private = (void *)nic; nwi->os_context.os_private = (void *)nic;
nwi->os_context.tx_buffer_size = LINUX_TX_SIZE; nwi->os_context.tx_buffer_size = LINUX_TX_SIZE;
nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs; nwi->os_context.txq_critical_section = (void *)&g_linux_wlan->txq_cs;
nwi->os_context.txq_add_to_head_critical_section = (void *)&g_linux_wlan->txq_add_to_head_cs;
#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

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

@ -68,7 +68,6 @@ typedef struct {
**/ **/
void *txq_lock; void *txq_lock;
struct semaphore *txq_add_to_head_lock;
unsigned long txq_spinlock_flags; unsigned long txq_spinlock_flags;
struct txq_entry_t *txq_head; struct txq_entry_t *txq_head;
@ -228,7 +227,8 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
{ {
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan; wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
unsigned long flags; unsigned long flags;
if (p->os_func.os_wait(p->txq_add_to_head_lock, CFG_PKTS_TIMEOUT)) if (p->os_func.os_wait(&g_linux_wlan->txq_add_to_head_cs,
CFG_PKTS_TIMEOUT))
return -1; return -1;
spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags); spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags);
@ -248,7 +248,7 @@ static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
PRINT_D(TX_DBG, "Number of entries in TxQ = %d\n", p->txq_entries); PRINT_D(TX_DBG, "Number of entries in TxQ = %d\n", p->txq_entries);
spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags); spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags);
up(p->txq_add_to_head_lock); up(&g_linux_wlan->txq_add_to_head_cs);
/** /**
@ -843,7 +843,8 @@ static int wilc_wlan_handle_txq(u32 *pu32TxqCount)
if (p->quit) if (p->quit)
break; break;
p->os_func.os_wait(p->txq_add_to_head_lock, CFG_PKTS_TIMEOUT); p->os_func.os_wait(&g_linux_wlan->txq_add_to_head_cs,
CFG_PKTS_TIMEOUT);
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
wilc_wlan_txq_filter_dup_tcp_ack(); wilc_wlan_txq_filter_dup_tcp_ack();
#endif #endif
@ -1112,7 +1113,7 @@ _end_:
if (ret != 1) if (ret != 1)
break; break;
} while (0); } while (0);
up(p->txq_add_to_head_lock); up(&g_linux_wlan->txq_add_to_head_cs);
p->txq_exit = 1; p->txq_exit = 1;
PRINT_D(TX_DBG, "THREAD: Exiting txq\n"); PRINT_D(TX_DBG, "THREAD: Exiting txq\n");
@ -1971,8 +1972,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
g_wlan.hif_lock = inp->os_context.hif_critical_section; g_wlan.hif_lock = inp->os_context.hif_critical_section;
g_wlan.txq_lock = inp->os_context.txq_critical_section; g_wlan.txq_lock = inp->os_context.txq_critical_section;
g_wlan.txq_add_to_head_lock = inp->os_context.txq_add_to_head_critical_section;
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)
g_wlan.rx_buffer_size = inp->os_context.rx_buffer_size; g_wlan.rx_buffer_size = inp->os_context.rx_buffer_size;

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

@ -112,9 +112,6 @@ typedef struct {
u32 tx_buffer_size; u32 tx_buffer_size;
void *txq_critical_section; void *txq_critical_section;
void *txq_add_to_head_critical_section;
#if defined(MEMORY_STATIC) #if defined(MEMORY_STATIC)
u32 rx_buffer_size; u32 rx_buffer_size;
#endif #endif