staging: wilc1000: remove function pointer cfg_wid_get

Remove function pointer cfg_wid_get and call the function
wilc_wlan_cfg_get_wid instead. Remove static from the function declaration.

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>

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 442fe5f10842e6cb52055be0c5d14b82ee8e9f7d..fbc0829126713a1e9e086cabec5c5cc03ee2658a 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1804,7 +1804,7 @@ int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler)
                p->cfg_frame_offset = 0;
 
        offset = p->cfg_frame_offset;
-       ret_size = mac_cfg.cfg_wid_get(p->cfg_frame.frame, offset, (u16)wid);
+       ret_size = wilc_wlan_cfg_get_wid(p->cfg_frame.frame, offset, (u16)wid);
        offset += ret_size;
        p->cfg_frame_offset = offset;
 

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 90417d9d39eef6eb06fd4821ba8bb48bff847fe5..bbf3e02259719c614f6da67c80a7bf30d025a63f 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -296,7 +296,6 @@ typedef struct {
 } wilc_cfg_rsp_t;
 
 typedef struct {
-       int (*cfg_wid_get)(u8 *, u32, u16);
        int (*cfg_wid_get_val)(u16, u8 *, u32);
        int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *);
        int (*cfg_init)(wilc_debug_func);

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c
index e5296c189de4838a47c030a34248be53449eb7c7..7007381a1ad8948f950c2850cecd811f384be7e9 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -411,7 +411,7 @@ int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size)
        return ret;
 }
 
-static int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
+int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
 {
        u8 *buf;
 
@@ -566,7 +566,6 @@ static int wilc_wlan_cfg_init(wilc_debug_func func)
 }
 
 wilc_cfg_func_t mac_cfg = {
-       wilc_wlan_cfg_get_wid,
        wilc_wlan_cfg_get_wid_value,
        wilc_wlan_cfg_indicate_rx,
        wilc_wlan_cfg_init,

diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wilc_wlan_cfg.h
index 326c716d50457f9979dab8fcf5c4d3eafbbd80a7..2edd74938464526038c89058dd249c6cb2eaf783 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan_cfg.h
+++ b/drivers/staging/wilc1000/wilc_wlan_cfg.h
@@ -31,5 +31,6 @@ typedef struct {
 } wilc_cfg_str_t;
 
 int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size);
+int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id);
 
 #endif