staging: wilc1000: remove function pointer wlan_handle_tx_que

This patch removes function pointer wlan_handle_tx_que and just call
the function wilc_wlan_handle_txq. Remove static from the function also.
There is one function call wlan_handle_tx_que which does not have an argument
and return value. So put txq_count as argument and ret for return value.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@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 e40ee8c98597e464b2217cbbb698be9155011e04..c2c9f3a7d5f31f81c94e7d23545c9f4d9ca8abcd 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -517,10 +517,10 @@ static int linux_wlan_txq_task(void *vp)
                }
                PRINT_D(TX_DBG, "txq_task handle the sending packet and let me go to sleep.\n");
 #if !defined USE_TX_BACKOFF_DELAY_IF_NO_BUFFERS
-               g_linux_wlan->oup.wlan_handle_tx_que();
+               ret = wilc_wlan_handle_txq(&txq_count);
 #else
                do {
-                       ret = g_linux_wlan->oup.wlan_handle_tx_que(&txq_count);
+                       ret = wilc_wlan_handle_txq(&txq_count);
                        if (txq_count < FLOW_CONTROL_LOWER_THRESHOLD /* && netif_queue_stopped(pd->wilc_netdev)*/) {
                                PRINT_D(TX_DBG, "Waking up queue\n");
                                /* netif_wake_queue(pd->wilc_netdev); */

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index fcc4155941bc6b59bc7ba760996357f76603e562..32045a93cc91d11b19e09362b7388a6f4e40b4c9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -816,7 +816,7 @@ void chip_sleep_manually(u32 u32SleepTime)
  *      Tx, Rx queue handle functions
  *
  ********************************************/
-static int wilc_wlan_handle_txq(u32 *pu32TxqCount)
+int wilc_wlan_handle_txq(u32 *pu32TxqCount)
 {
        wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
        int i, entries = 0;
@@ -2028,7 +2028,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
        /**
         *      export functions
         **/
-       oup->wlan_handle_tx_que = wilc_wlan_handle_txq;
        oup->wlan_handle_rx_isr = wilc_handle_isr;
        oup->wlan_cleanup = wilc_wlan_cleanup;
        oup->wlan_cfg_set = wilc_wlan_cfg_set;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 2af027ccc101be8d1373d9e9c322957f7f492359..7a395cf239ac21a804e39b6ea6e643df00987d1a 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -310,4 +310,5 @@ int wilc_wlan_start(void);
 int wilc_wlan_stop(void);
 int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,
                              wilc_tx_complete_func_t func);
+int wilc_wlan_handle_txq(u32 *pu32TxqCount);
 #endif

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 25d9d908f2844cc6951a558233fbdf62e68f7b64..d41a1d414666550a543bf3954f1fb078bec1c19c 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
 #define WILC_TX_ERR_NO_BUF     (-2)
 
 typedef struct {
-       int (*wlan_handle_tx_que)(u32 *);
        void (*wlan_handle_rx_isr)(void);
        void (*wlan_cleanup)(void);
        int (*wlan_cfg_set)(int, u32, u8 *, u32, int, u32);