Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63d7ab8e authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

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: 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 070d365c

drivers/staging/wilc1000/linux_wlan.c

+2 −1
Original line number Diff line number Diff line
@@ -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_;

drivers/staging/wilc1000/wilc_wlan.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wilc1000/wilc_wlan.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1
Original line number Diff line number Diff line
@@ -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);