diff options
| author | Glen Lee | 2015-10-01 09:03:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-02 11:59:52 +0200 |
| commit | 1028e5a4045f541662909d148d024505c01fafb7 (patch) | |
| tree | 34f93e75db0d22a869471d9a874b7f04b47b26f8 /drivers/staging/wilc1000/coreconfigurator.c | |
| parent | staging: wilc1000: delete define ACTION and PROBE_REQ (diff) | |
| download | kernel-qcow2-linux-1028e5a4045f541662909d148d024505c01fafb7.tar.gz kernel-qcow2-linux-1028e5a4045f541662909d148d024505c01fafb7.tar.xz kernel-qcow2-linux-1028e5a4045f541662909d148d024505c01fafb7.zip | |
staging: wilc1000: remove function pointer wlan_cfg_set
This patch removes function pointer wlan_cfg_set and just call
the function wilc_wlan_cfg_set. 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.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index b6b19fe36ae1..4e9fecae42b8 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -11,6 +11,7 @@ #include "coreconfigurator.h" #include "wilc_wlan_if.h" +#include "wilc_wlan.h" #include <linux/errno.h> #include <linux/slab.h> #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \ @@ -613,8 +614,7 @@ s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs, } else { PRINT_D(CORECONFIG_DBG, "Net Dev is initialized\n"); } - if (gpstrWlanOps->wlan_cfg_set == NULL || - gpstrWlanOps->wlan_cfg_get == NULL) { + if (gpstrWlanOps->wlan_cfg_get == NULL) { PRINT_D(CORECONFIG_DBG, "Set and Get is still not initialized\n"); return 1; } else { @@ -642,10 +642,12 @@ s32 send_config_pkt(u8 u8Mode, tstrWID *pstrWIDs, } else if (u8Mode == SET_CFG) { for (counter = 0; counter < u32WIDsCount; counter++) { PRINT_D(CORECONFIG_DBG, "Sending config SET PACKET WID:%x\n", pstrWIDs[counter].u16WIDid); - if (!gpstrWlanOps->wlan_cfg_set(!counter, - pstrWIDs[counter].u16WIDid, pstrWIDs[counter].ps8WidVal, - pstrWIDs[counter].s32ValueSize, - (counter == u32WIDsCount - 1), drvHandler)) { + if (!wilc_wlan_cfg_set(!counter, + pstrWIDs[counter].u16WIDid, + pstrWIDs[counter].ps8WidVal, + pstrWIDs[counter].s32ValueSize, + (counter == u32WIDsCount - 1), + drvHandler)) { ret = -1; printk("[Sendconfigpkt]Set Timed out\n"); break; |