openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Glen Lee 2015-10-01 16:03:32 +09:00 committed by Greg Kroah-Hartman
parent 070d365c3d
commit 63d7ab8efd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/wilc1000/linux_wlan.c
View File

@ -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_;

3
drivers/staging/wilc1000/wilc_wlan.c
View File

@ -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;

1
drivers/staging/wilc1000/wilc_wlan.h
View File

@ -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

1
drivers/staging/wilc1000/wilc_wlan_if.h
View File

@ -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);