mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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>
This commit is contained in:
parent
63d7ab8efd
commit
e42563bbb2
4 changed files with 3 additions and 4 deletions
|
@ -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_;
|
||||
|
|
|
@ -1471,7 +1471,7 @@ int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size)
|
|||
* 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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 *);
|
||||
|
|
Loading…
Reference in a new issue