mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
staging: wilc1000: remove function pointer wlan_handle_rx_isr
This patch removes function pointer wlan_handle_rx_isr and just call the function wilc_handle_isr. 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>
This commit is contained in:
parent
f590c4ce17
commit
46ca80cd16
4 changed files with 2 additions and 6 deletions
|
@ -313,10 +313,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
|
|||
}
|
||||
|
||||
PRINT_D(INT_DBG, "Interrupt received BH\n");
|
||||
if (g_linux_wlan->oup.wlan_handle_rx_isr != 0)
|
||||
g_linux_wlan->oup.wlan_handle_rx_isr();
|
||||
else
|
||||
PRINT_ER("wlan_handle_rx_isr() hasn't been initialized\n");
|
||||
wilc_handle_isr();
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
|
|
@ -2028,7 +2028,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
|
|||
/**
|
||||
* export functions
|
||||
**/
|
||||
oup->wlan_handle_rx_isr = wilc_handle_isr;
|
||||
oup->wlan_cleanup = wilc_wlan_cleanup;
|
||||
oup->wlan_cfg_set = wilc_wlan_cfg_set;
|
||||
oup->wlan_cfg_get = wilc_wlan_cfg_get;
|
||||
|
|
|
@ -311,4 +311,5 @@ 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);
|
||||
void wilc_handle_isr(void);
|
||||
#endif
|
||||
|
|
|
@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
|
|||
#define WILC_TX_ERR_NO_BUF (-2)
|
||||
|
||||
typedef struct {
|
||||
void (*wlan_handle_rx_isr)(void);
|
||||
void (*wlan_cleanup)(void);
|
||||
int (*wlan_cfg_set)(int, u32, u8 *, u32, int, u32);
|
||||
int (*wlan_cfg_get)(int, u32, int, u32);
|
||||
|
|
Loading…
Reference in a new issue