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>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index c2c9f3a7d5f31f81c94e7d23545c9f4d9ca8abcd..e278d9408a85f2dc0bfc2e18f4ccfdde6c3fc3e2 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -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;
 }

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 32045a93cc91d11b19e09362b7388a6f4e40b4c9..e9af7451e37ad7d031f578b65f3ecaf369e99d2f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -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;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 7a395cf239ac21a804e39b6ea6e643df00987d1a..2054ad5693e2c5f714be5ba6423c65c99cab7484 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -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

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index d41a1d414666550a543bf3954f1fb078bec1c19c..91bf68abf09b88bead8c81b440622ec92cd17186 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 {
-       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);