Commit 46ca80cd authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

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: 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 f590c4ce
...@@ -313,10 +313,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata) ...@@ -313,10 +313,7 @@ irqreturn_t isr_bh_routine(int irq, void *userdata)
} }
PRINT_D(INT_DBG, "Interrupt received BH\n"); PRINT_D(INT_DBG, "Interrupt received BH\n");
if (g_linux_wlan->oup.wlan_handle_rx_isr != 0) wilc_handle_isr();
g_linux_wlan->oup.wlan_handle_rx_isr();
else
PRINT_ER("wlan_handle_rx_isr() hasn't been initialized\n");
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -2028,7 +2028,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) ...@@ -2028,7 +2028,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
/** /**
* export functions * export functions
**/ **/
oup->wlan_handle_rx_isr = wilc_handle_isr;
oup->wlan_cleanup = wilc_wlan_cleanup; oup->wlan_cleanup = wilc_wlan_cleanup;
oup->wlan_cfg_set = wilc_wlan_cfg_set; oup->wlan_cfg_set = wilc_wlan_cfg_set;
oup->wlan_cfg_get = wilc_wlan_cfg_get; oup->wlan_cfg_get = wilc_wlan_cfg_get;
......
...@@ -311,4 +311,5 @@ int wilc_wlan_stop(void); ...@@ -311,4 +311,5 @@ int wilc_wlan_stop(void);
int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,
wilc_tx_complete_func_t func); wilc_tx_complete_func_t func);
int wilc_wlan_handle_txq(u32 *pu32TxqCount); int wilc_wlan_handle_txq(u32 *pu32TxqCount);
void wilc_handle_isr(void);
#endif #endif
...@@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int); ...@@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
#define WILC_TX_ERR_NO_BUF (-2) #define WILC_TX_ERR_NO_BUF (-2)
typedef struct { typedef struct {
void (*wlan_handle_rx_isr)(void);
void (*wlan_cleanup)(void); void (*wlan_cleanup)(void);
int (*wlan_cfg_set)(int, u32, u8 *, u32, int, u32); int (*wlan_cfg_set)(int, u32, u8 *, u32, int, u32);
int (*wlan_cfg_get)(int, u32, int, u32); int (*wlan_cfg_get)(int, u32, int, u32);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment