diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-02 14:22:08 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-02 12:02:15 +0200 |
| commit | ec1b86bf6a47d6099cd502e6dc1a1217e2c6c23d (patch) | |
| tree | 453c59c6ed4458b4063330374bd2c48573a88230 | |
| parent | 17e8f16554f22e8e5e0146e1236c2ec64a047e92 (diff) | |
| download | op-kernel-dev-ec1b86bf6a47d6099cd502e6dc1a1217e2c6c23d.zip op-kernel-dev-ec1b86bf6a47d6099cd502e6dc1a1217e2c6c23d.tar.gz | |
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>
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 1 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_cfg.c | 3 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan_cfg.h | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 442fe5f..fbc0829 100644 --- 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 90417d9..bbf3e02 100644 --- 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 e5296c1..7007381 100644 --- 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 326c716..2edd749 100644 --- 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 |
