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

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>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 71f996ca91dc927f3d8a34bcc84e2a2d4080f0c4..5bec7f2a4148e0c3ecf356e61da7491571a27a22 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -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_wait_event = (void *)&g_linux_wlan->txq_event;
-
 #if defined(MEMORY_STATIC)
        nwi->os_context.rx_buffer_size = LINUX_RX_SIZE;
 #endif

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 911c922d17cd57fb9b1acbe2714dec14592c2bf0..de36057c383ce02f3323a3010eb602b8dc2776ea 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -75,7 +75,6 @@ typedef struct {
        struct txq_entry_t *txq_head;
        struct txq_entry_t *txq_tail;
        int txq_entries;
-       void *txq_wait;
        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");
 
-       up(p->txq_wait);
+       up(&g_linux_wlan->txq_event);
 }
 
 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
         **/
-       up(p->txq_wait);
+       up(&g_linux_wlan->txq_event);
        PRINT_D(TX_DBG, "Wake up the txq_handler\n");
 
        return 0;
@@ -458,7 +457,7 @@ static int wilc_wlan_txq_filter_dup_tcp_ack(void)
 
        while (Dropped > 0) {
                /*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--;
        }
 
@@ -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_wait = inp->os_context.txq_wait_event;
        g_wlan.cfg_wait = inp->os_context.cfg_wait_event;
        g_wlan.tx_buffer_size = inp->os_context.tx_buffer_size;
 #if defined (MEMORY_STATIC)

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 60943059d37a0393674b5dbdd0d7353f6f0e3eda..e3b112c00a14900104bcb7ba992d10009d96178d 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -115,8 +115,6 @@ typedef struct {
 
        void *txq_add_to_head_critical_section;
 
-       void *txq_wait_event;
-
 #if defined(MEMORY_STATIC)
        u32 rx_buffer_size;
 #endif