staging: wilc1000: remove function pointer wlan_firmware_download

This patch removes function pointer wlan_firmware_download and just call
the function wilc_wlan_firmware_download. 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 701d3179c99afc336a90f52826868da47d5cea31..d7909d38b79a327bbda4a5b47d4532c116660b68 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -670,7 +670,8 @@ static int linux_wlan_firmware_download(linux_wlan_t *p_nic)
         *      do the firmware download
         **/
        PRINT_D(INIT_DBG, "Downloading Firmware ...\n");
-       ret = g_linux_wlan->oup.wlan_firmware_download(g_linux_wlan->wilc_firmware->data, g_linux_wlan->wilc_firmware->size);
+       ret = wilc_wlan_firmware_download(g_linux_wlan->wilc_firmware->data,
+                                         g_linux_wlan->wilc_firmware->size);
        if (ret < 0)
                goto _FAIL_;
 

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 428e94fdd716d9c9cb68eef454a2baa4e86d89b6..5e9a4c2bd4bbd1c494c91f2edfd5d6eda0bb7399 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1398,7 +1398,7 @@ void wilc_handle_isr(void)
  *      Firmware download
  *
  ********************************************/
-static int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size)
+int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size)
 {
        wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
        u32 offset;
@@ -2027,7 +2027,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
        /**
         *      export functions
         **/
-       oup->wlan_firmware_download = wilc_wlan_firmware_download;
        oup->wlan_start = wilc_wlan_start;
        oup->wlan_stop = wilc_wlan_stop;
        oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt;

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

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