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 cfg_wid_get 

Remove function pointer cfg_wid_get and call the function
wilc_wlan_cfg_get_wid instead. Remove static from the function declaration.

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-02 14:22:08 +09:00 committed by Greg Kroah-Hartman
parent 17e8f16554
commit ec1b86bf6a
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1804,7 +1804,7 @@ int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
p->cfg_frame_offset = 0;
offset = p->cfg_frame_offset;
ret_size = mac_cfg.cfg_wid_get(p->cfg_frame.frame, offset, (u16)wid);
ret_size = wilc_wlan_cfg_get_wid(p->cfg_frame.frame, offset, (u16)wid);
offset += ret_size;
p->cfg_frame_offset = offset;

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

@ -296,7 +296,6 @@ typedef struct {
} wilc_cfg_rsp_t;
typedef struct {
int (*cfg_wid_get)(u8 *, u32, u16);
int (*cfg_wid_get_val)(u16, u8 *, u32);
int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);
int (*cfg_init)(wilc_debug_func);

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

@ -411,7 +411,7 @@ int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)
return ret;
}
static int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
{
u8 *buf;
@ -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,
wilc_wlan_cfg_get_wid_value,
wilc_wlan_cfg_indicate_rx,
wilc_wlan_cfg_init,

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

@ -31,5 +31,6 @@ typedef struct {
} wilc_cfg_str_t;
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);
#endif