diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-02 14:22:07 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-02 12:02:15 +0200 |
| commit | 17e8f16554f22e8e5e0146e1236c2ec64a047e92 (patch) | |
| tree | 43f55e88d80dc896f20e548cc3236e28df10d2a9 /drivers/staging/wilc1000 | |
| parent | 66482a56425036e605e60bf56c573b30d0596a7b (diff) | |
| download | op-kernel-dev-17e8f16554f22e8e5e0146e1236c2ec64a047e92.zip op-kernel-dev-17e8f16554f22e8e5e0146e1236c2ec64a047e92.tar.gz | |
staging: wilc1000: remove function pointer cfg_wid_set
This patch removes function pointer cfg_wid_set and call the function
wilc_wlan_cfg_set_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>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 5 | ||||
| -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 | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index 9475ec7..442fe5f 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -9,6 +9,7 @@ #include "wilc_wlan_if.h" #include "wilc_wlan.h" +#include "wilc_wlan_cfg.h" /******************************************** * @@ -1763,8 +1764,8 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, p->cfg_frame_offset = 0; offset = p->cfg_frame_offset; - ret_size = mac_cfg.cfg_wid_set(p->cfg_frame.frame, offset, (u16)wid, - buffer, buffer_size); + ret_size = wilc_wlan_cfg_set_wid(p->cfg_frame.frame, offset, (u16)wid, + buffer, buffer_size); 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 1ba433c..90417d9 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_set)(u8 *, u32, u16, u8 *, int); int (*cfg_wid_get)(u8 *, u32, u16); int (*cfg_wid_get_val)(u16, u8 *, u32); int (*rx_indicate)(u8 *, int, wilc_cfg_rsp_t *); diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.c b/drivers/staging/wilc1000/wilc_wlan_cfg.c index d761a37..e5296c1 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.c +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.c @@ -386,7 +386,7 @@ static int wilc_wlan_parse_info_frame(u8 *info, int size) * ********************************************/ -static int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size) +int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size) { u8 type = (id >> 12) & 0xf; int ret = 0; @@ -566,7 +566,6 @@ static int wilc_wlan_cfg_init(wilc_debug_func func) } wilc_cfg_func_t mac_cfg = { - wilc_wlan_cfg_set_wid, wilc_wlan_cfg_get_wid, wilc_wlan_cfg_get_wid_value, wilc_wlan_cfg_indicate_rx, diff --git a/drivers/staging/wilc1000/wilc_wlan_cfg.h b/drivers/staging/wilc1000/wilc_wlan_cfg.h index ef88358..326c716 100644 --- a/drivers/staging/wilc1000/wilc_wlan_cfg.h +++ b/drivers/staging/wilc1000/wilc_wlan_cfg.h @@ -30,4 +30,6 @@ typedef struct { u8 *str; } wilc_cfg_str_t; +int wilc_wlan_cfg_set_wid(u8 *frame, u32 offset, u16 id, u8 *buf, int size); + #endif |
