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

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: 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 63d7ab8e
...@@ -622,7 +622,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t *nic) ...@@ -622,7 +622,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t *nic)
int ret = 0; int ret = 0;
/* start firmware */ /* start firmware */
PRINT_D(INIT_DBG, "Starting Firmware ...\n"); PRINT_D(INIT_DBG, "Starting Firmware ...\n");
ret = g_linux_wlan->oup.wlan_start(); ret = wilc_wlan_start();
if (ret < 0) { if (ret < 0) {
PRINT_ER("Failed to start Firmware\n"); PRINT_ER("Failed to start Firmware\n");
goto _fail_; goto _fail_;
......
...@@ -1471,7 +1471,7 @@ int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size) ...@@ -1471,7 +1471,7 @@ int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size)
* Common * Common
* *
********************************************/ ********************************************/
static int wilc_wlan_start(void) int wilc_wlan_start(void)
{ {
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan; wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
u32 reg = 0; u32 reg = 0;
...@@ -2027,7 +2027,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) ...@@ -2027,7 +2027,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
/** /**
* export functions * export functions
**/ **/
oup->wlan_start = wilc_wlan_start;
oup->wlan_stop = wilc_wlan_stop; oup->wlan_stop = wilc_wlan_stop;
oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt; oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt;
oup->wlan_handle_tx_que = wilc_wlan_handle_txq; oup->wlan_handle_tx_que = wilc_wlan_handle_txq;
......
...@@ -306,4 +306,5 @@ typedef struct { ...@@ -306,4 +306,5 @@ typedef struct {
} wilc_cfg_func_t; } wilc_cfg_func_t;
int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size); int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);
int wilc_wlan_start(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 {
int (*wlan_start)(void);
int (*wlan_stop)(void); int (*wlan_stop)(void);
int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t); int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t);
int (*wlan_handle_tx_que)(u32 *); int (*wlan_handle_tx_que)(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