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

Commit 17e8f165 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove function pointer cfg_wid_set 



This patch removes function pointer cfg_wid_set and call the function
wilc_wlan_cfg_set_wid instead. 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 66482a56

drivers/staging/wilc1000/wilc_wlan.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include "wilc_wlan_if.h"

#include "wilc_wlan.h"

#include "wilc_wlan_cfg.h"



/********************************************

 *
@@ -1763,7 +1764,7 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, 
		p->cfg_frame_offset = 0;



	offset = p->cfg_frame_offset;

	ret_size = mac_cfg.cfg_wid_set(p->cfg_frame.frame, offset, (u16)wid,

	ret_size = wilc_wlan_cfg_set_wid(p->cfg_frame.frame, offset, (u16)wid,

					 buffer, buffer_size);

	offset += ret_size;

	p->cfg_frame_offset = offset;

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_set)(u8 *, u32, u16, u8 *, int);

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

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

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

drivers/staging/wilc1000/wilc_wlan_cfg.c

+1 −2
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size) 
 *

 ********************************************/



static int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)

int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)

{

	u8 type = (id >> 12) & 0xf;

	int 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_set_wid,

	wilc_wlan_cfg_get_wid,

	wilc_wlan_cfg_get_wid_value,

	wilc_wlan_cfg_indicate_rx,

drivers/staging/wilc1000/wilc_wlan_cfg.h

+2 −0
Original line number Diff line number Diff line
@@ -30,4 +30,6 @@ typedef struct { 
	u8 *str;

} wilc_cfg_str_t;



int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size);



#endif