staging: wilc1000: remove function pointer wlan_start

This patch removes function pointer wlan_start and just call
the function wilc_wlan_start. Remove static from the function also.

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 d7909d38b79a327bbda4a5b47d4532c116660b68..f515fcab56153d2af54e8bc6264af049f2ba88d5 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -622,7 +622,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t *nic)
        int ret = 0;
        /* start firmware */
        PRINT_D(INIT_DBG, "Starting Firmware ...\n");
-       ret = g_linux_wlan->oup.wlan_start();
+       ret = wilc_wlan_start();
        if (ret < 0) {
                PRINT_ER("Failed to start Firmware\n");
                goto _fail_;

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 5e9a4c2bd4bbd1c494c91f2edfd5d6eda0bb7399..6e2bf4cd5c5e778173a84f26f0f39cc8a7dcd0b7 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1471,7 +1471,7 @@ _fail_1:
  *      Common
  *
  ********************************************/
-static int wilc_wlan_start(void)
+int wilc_wlan_start(void)
 {
        wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
        u32 reg = 0;
@@ -2027,7 +2027,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
        /**
         *      export functions
         **/
-       oup->wlan_start = wilc_wlan_start;
        oup->wlan_stop = wilc_wlan_stop;
        oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt;
        oup->wlan_handle_tx_que = wilc_wlan_handle_txq;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 72d2ebf2df972239a7989b2958dfde305dbc349c..15ae9aeeacf49bb2a862e8333584a7703fdabf75 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -306,4 +306,5 @@ typedef struct {
 } wilc_cfg_func_t;
 
 int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);
+int wilc_wlan_start(void);
 #endif

diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index e481446626fd46da89cd6feb9a85a9caa8a31946..e752092f4d400dd0c0fece62e5593f3561187d64 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_start)(void);
        int (*wlan_stop)(void);
        int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t);
        int (*wlan_handle_tx_que)(u32 *);