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

Commit 814bc368 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove function pointer cfg_init 



This patch removes function pointer cfg_init and call the function
wilc_wlan_cfg_init instead. Remove static from function declaration.
After removing cfg_init, the struct wilc_cfg_func_t is useless so just delete
it and it's related codes.

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 30f535a6

drivers/staging/wilc1000/wilc_wlan.c

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 ********************************************/

extern wilc_hif_func_t hif_sdio;

extern wilc_hif_func_t hif_spi;

extern wilc_cfg_func_t mac_cfg;

extern void WILC_WFI_mgmt_rx(u8 *buff, u32 size);

u32 wilc_get_chipid(u8 update);

u16 Set_machw_change_vir_if(bool bValue);
@@ -1994,7 +1993,7 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp) 
	/***

	 *      mac interface init

	 **/

	if (!mac_cfg.cfg_init(wilc_debug)) {

	if (!wilc_wlan_cfg_init(wilc_debug)) {

		/* ENOBUFS	105 */

		ret = -105;

		goto _fail_;

drivers/staging/wilc1000/wilc_wlan.h

+0 −4
Original line number Diff line number Diff line
@@ -295,10 +295,6 @@ typedef struct { 
	u32 seq_no;

} wilc_cfg_rsp_t;



typedef struct {

	int (*cfg_init)(wilc_debug_func);

} wilc_cfg_func_t;



int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);

int wilc_wlan_start(void);

int wilc_wlan_stop(void);

drivers/staging/wilc1000/wilc_wlan_cfg.c

+1 −5
Original line number Diff line number Diff line
@@ -558,13 +558,9 @@ int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp) 
	return ret;

}



static int wilc_wlan_cfg_init(wilc_debug_func func)

int wilc_wlan_cfg_init(wilc_debug_func func)

{

	memset((void *)&g_mac, 0, sizeof(wilc_mac_cfg_t));

	g_mac.dPrint = func;

	return 1;

}
 


wilc_cfg_func_t mac_cfg = {

	wilc_wlan_cfg_init,

};

drivers/staging/wilc1000/wilc_wlan_cfg.h

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size); 
int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id);

int wilc_wlan_cfg_get_wid_value(u16 wid, u8 *buffer, u32 buffer_size);

int wilc_wlan_cfg_indicate_rx(u8 *frame, int size, wilc_cfg_rsp_t *rsp);

int wilc_wlan_cfg_init(wilc_debug_func func);



#endif