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
This patch removes function pointer wlan_cfg_get and just call the function wilc_wlan_cfg_get. 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
1028e5a404
commit
07056a8507
5 changed files with 7 additions and 13 deletions
|
@ -614,19 +614,14 @@ s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs,
|
|||
} else {
|
||||
PRINT_D(CORECONFIG_DBG, "Net Dev is initialized\n");
|
||||
}
|
||||
if (gpstrWlanOps->wlan_cfg_get == NULL) {
|
||||
PRINT_D(CORECONFIG_DBG, "Set and Get is still not initialized\n");
|
||||
return 1;
|
||||
} else {
|
||||
PRINT_D(CORECONFIG_DBG, "SET is initialized\n");
|
||||
}
|
||||
if (u8Mode == GET_CFG) {
|
||||
for (counter = 0; counter < u32WIDsCount; counter++) {
|
||||
PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,
|
||||
(counter == u32WIDsCount - 1));
|
||||
if (!gpstrWlanOps->wlan_cfg_get(!counter,
|
||||
pstrWIDs[counter].u16WIDid,
|
||||
(counter == u32WIDsCount - 1), drvHandler)) {
|
||||
if (!wilc_wlan_cfg_get(!counter,
|
||||
pstrWIDs[counter].u16WIDid,
|
||||
(counter == u32WIDsCount - 1),
|
||||
drvHandler)) {
|
||||
ret = -1;
|
||||
printk("[Sendconfigpkt]Get Timed out\n");
|
||||
break;
|
||||
|
|
|
@ -1284,7 +1284,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic)
|
|||
|
||||
wilc_bus_set_max_speed();
|
||||
|
||||
if (g_linux_wlan->oup.wlan_cfg_get(1, WID_FIRMWARE_VERSION, 1, 0)) {
|
||||
if (wilc_wlan_cfg_get(1, WID_FIRMWARE_VERSION, 1, 0)) {
|
||||
int size;
|
||||
char Firmware_ver[20];
|
||||
|
||||
|
|
|
@ -1789,7 +1789,7 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
|
|||
|
||||
return ret_size;
|
||||
}
|
||||
static int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
|
||||
int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
|
||||
{
|
||||
wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;
|
||||
u32 offset;
|
||||
|
@ -2029,7 +2029,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup)
|
|||
/**
|
||||
* export functions
|
||||
**/
|
||||
oup->wlan_cfg_get = wilc_wlan_cfg_get;
|
||||
oup->wlan_cfg_get_value = wilc_wlan_cfg_get_val;
|
||||
|
||||
oup->wlan_add_mgmt_to_tx_que = wilc_wlan_txq_add_mgmt_pkt;
|
||||
|
|
|
@ -313,4 +313,5 @@ void wilc_handle_isr(void);
|
|||
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);
|
||||
#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)(int, u32, int, u32);
|
||||
int (*wlan_cfg_get_value)(u32, u8 *, u32);
|
||||
int (*wlan_add_mgmt_to_tx_que)(void *, u8 *, u32,
|
||||
wilc_tx_complete_func_t);
|
||||
|
|
Loading…
Reference in a new issue