summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wilc1000/coreconfigurator.c
diff options
context:
space:
mode:
authorGlen Lee2015-10-01 09:03:41 +0200
committerGreg Kroah-Hartman2015-10-02 11:59:52 +0200
commit07056a85078ad4d8114c9898799f7ded626a4023 (patch)
tree7e246b0a039cba6935eb405ae3ab71c7c001dacf /drivers/staging/wilc1000/coreconfigurator.c
parentstaging: wilc1000: remove function pointer wlan_cfg_set (diff)
downloadkernel-qcow2-linux-07056a85078ad4d8114c9898799f7ded626a4023.tar.gz
kernel-qcow2-linux-07056a85078ad4d8114c9898799f7ded626a4023.tar.xz
kernel-qcow2-linux-07056a85078ad4d8114c9898799f7ded626a4023.zip
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>
Diffstat (limited to 'drivers/staging/wilc1000/coreconfigurator.c')
-rw-r--r--drivers/staging/wilc1000/coreconfigurator.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 4e9fecae42b8..74ff763cc6a3 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -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;