mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
staging: wilc1000: remove function pointer wlan_cfg_get_value
This patch removes function pointer wlan_cfg_get_value and just call the function wilc_wlan_cfg_get_val. Remove static from the function also. 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:
parent
07056a8507
commit
894de36b1a
5 changed files with 7 additions and 8 deletions
|
@ -629,9 +629,10 @@ s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs,
|
|||
}
|
||||
counter = 0;
|
||||
for (counter = 0; counter < u32WIDsCount; counter++) {
|
||||
pstrWIDs[counter].s32ValueSize = gpstrWlanOps->wlan_cfg_get_value(
|
||||
pstrWIDs[counter].s32ValueSize = wilc_wlan_cfg_get_val(
|
||||
pstrWIDs[counter].u16WIDid,
|
||||
pstrWIDs[counter].ps8WidVal, pstrWIDs[counter].s32ValueSize);
|
||||
pstrWIDs[counter].ps8WidVal,
|
||||
pstrWIDs[counter].s32ValueSize);
|
||||
|
||||
}
|
||||
} else if (u8Mode == SET_CFG) {
|
||||
|
|
|
@ -395,7 +395,7 @@ void linux_wlan_mac_indicate(int flag)
|
|||
int status;
|
||||
|
||||
if (flag == WILC_MAC_INDICATE_STATUS) {
|
||||
pd->oup.wlan_cfg_get_value(WID_STATUS, (unsigned char *)&status, 4);
|
||||
wilc_wlan_cfg_get_val(WID_STATUS, (unsigned char *)&status, 4);
|
||||
if (pd->mac_status == WILC_MAC_STATUS_INIT) {
|
||||
pd->mac_status = status;
|
||||
up(&pd->sync_event);
|
||||
|
@ -1288,7 +1288,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
|
|||
int size;
|
||||
char Firmware_ver[20];
|
||||
|
||||
size = g_linux_wlan->oup.wlan_cfg_get_value(
|
||||
size = wilc_wlan_cfg_get_val(
|
||||
WID_FIRMWARE_VERSION,
|
||||
Firmware_ver, sizeof(Firmware_ver));
|
||||
Firmware_ver[size] = '\0';
|
||||
|
|
|
@ -1828,7 +1828,7 @@ int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
|
|||
return ret_size;
|
||||
}
|
||||
|
||||
static int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size)
|
||||
int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -2029,8 +2029,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
|
|||
/**
|
||||
* export functions
|
||||
**/
|
||||
oup->wlan_cfg_get_value = wilc_wlan_cfg_get_val;
|
||||
|
||||
oup->wlan_add_mgmt_to_tx_que = wilc_wlan_txq_add_mgmt_pkt;
|
||||
|
||||
if (!init_chip()) {
|
||||
|
|
|
@ -314,4 +314,5 @@ void wilc_wlan_cleanup(void);
|
|||
int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
|
||||
int commit, u32 drvHandler);
|
||||
int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler);
|
||||
int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size);
|
||||
#endif
|
||||
|
|
|
@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int);
|
|||
#define WILC_TX_ERR_NO_BUF (-2)
|
||||
|
||||
typedef struct {
|
||||
int (*wlan_cfg_get_value)(u32, u8 *, u32);
|
||||
int (*wlan_add_mgmt_to_tx_que)(void *, u8 *, u32,
|
||||
wilc_tx_complete_func_t);
|
||||
} wilc_wlan_oup_t;
|
||||
|
|
Loading…
Reference in a new issue