Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f590c4ce authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

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: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fc84a6f

drivers/staging/wilc1000/linux_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -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); */

drivers/staging/wilc1000/wilc_wlan.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wilc1000/wilc_wlan.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1
Original line number Diff line number Diff line
@@ -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);