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

Commit 355cca2a authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove function pointer cfg_wid_get_val 



This patch removes cfg_wid_get_val and call the function
wilc_wlan_cfg_get_wid_value. Remove static from the function declaration.

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 ec1b86bf

drivers/staging/wilc1000/wilc_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size) 
{

	int ret;



	ret = mac_cfg.cfg_wid_get_val((u16)wid, buffer, buffer_size);

	ret = wilc_wlan_cfg_get_wid_value((u16)wid, buffer, buffer_size);



	return ret;

}

drivers/staging/wilc1000/wilc_wlan.h

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ typedef struct { 
} wilc_cfg_rsp_t;



typedef struct {

	int (*cfg_wid_get_val)(u16, u8 *, u32);

	int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);

	int (*cfg_init)(wilc_debug_func);

} wilc_cfg_func_t;

drivers/staging/wilc1000/wilc_wlan_cfg.c

+1 −2
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id) 
	return 2;

}



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

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

{

	u32 type = (wid >> 12) & 0xf;

	int i, ret = 0;
@@ -566,7 +566,6 @@ static int wilc_wlan_cfg_init(wilc_debug_func func) 
}



wilc_cfg_func_t mac_cfg = {

	wilc_wlan_cfg_get_wid_value,

	wilc_wlan_cfg_indicate_rx,

	wilc_wlan_cfg_init,

};

drivers/staging/wilc1000/wilc_wlan_cfg.h

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ typedef struct { 


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



#endif