staging: wilc1000: Replace function wilc_wlan_cfg_get_val()
PATCH 1/1 staging: wilc1000: Replace function wilc_wlan_cfg_get_val()
Include wilc_wlan_cfg.h in wilc_netdev.c to enable it to call functions in wilc_wlan_cfg.c.
Remove function wilc_wlan_cfg_get_val as all it does is call wilc_wlan_cfg_get_wid_value in file wilc_wlan_cfg.c.
Rename function wilc_wlan_cfg_get_wid_value to wilc_wlan_cfg_get_val to maintain compatibility with call sites (including in wilc_netdev.c). Issue found with Coccinelle.
Signed-off-by Nishka Dasgupta <[email protected]>
--- drivers/staging/wilc1000/wilc_netdev.c | 1 + drivers/staging/wilc1000/wilc_wlan.c | 5 ----- drivers/staging/wilc1000/wilc_wlan.h | 2 -- drivers/staging/wilc1000/wilc_wlan_cfg.c | 4 ++-- drivers/staging/wilc1000/wilc_wlan_cfg.h | 4 ++-- 5 files changed, 5 insertions(+), 11 deletions(-)
drivers/staging/wilc1000/wilc_netdev.c +1 -0
@@ -11,6 +11,7 @@#include <linux/inetdevice.h> #include "wilc_wfi_cfgoperations.h" +#include "wilc_wlan_cfg.h" #define WILC_MULTICAST_TABLE_SIZE 8
drivers/staging/wilc1000/wilc_wlan.c +0 -5
@@ -1196,11 +1196,6 @@ int wilc_wlan_cfg_get(struct wilc_vif *vif, int start, u16 wid, int commit,return ret_size; } -int wilc_wlan_cfg_get_val (struct wilc *wl,u16 wid,u8 *buffer,u32 buffer_size) -{ -return wilc_wlan_cfg_get_wid_value (wl, wid, buffer, buffer_size); -} -int wilc_send_config_pkt (struct wilc_vif *vif,u8 mode,struct wid *wids,u32 count) {
drivers/staging/wilc1000/wilc_wlan.h +0 -2
@@ -291,8 +291,6 @@ int wilc_wlan_cfg_set(struct wilc_vif *vif, int start, u16 wid, u8 *buffer, u32 buffer_size, int commit, u32 drv_handler);int wilc_wlan_cfg_get (struct wilc_vif *vif,int start,u16 wid,int commit,u32 drv_handler); -int wilc_wlan_cfg_get_val (struct wilc *wl,u16 wid,u8 *buffer, -u32 buffer_size);int wilc_wlan_txq_add_mgmt_pkt (struct net_device *dev,void *priv,u8 *buffer,u32 buffer_size,void (*func)(void *,int ));void wilc_chip_sleep_manually (struct wilc *wilc);
drivers/staging/wilc1000/wilc_wlan_cfg.c +2 -2
@@ -320,8 +320,8 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)return 2 ; } -int wilc_wlan_cfg_get_wid_value (struct wilc *wl,u16 wid,u8 *buffer, -u32 buffer_size) +int wilc_wlan_cfg_get_val (struct wilc *wl,u16 wid,u8 *buffer, +u32 buffer_size) {u32 type = (wid >>12 ) &0xf ;int i, ret =0 ;
drivers/staging/wilc1000/wilc_wlan_cfg.h +2 -2
@@ -44,8 +44,8 @@ struct wilc_cfg {struct wilc ;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); -int wilc_wlan_cfg_get_wid_value (struct wilc *wl,u16 wid,u8 *buffer, -u32 buffer_size); +int wilc_wlan_cfg_get_val (struct wilc *wl,u16 wid,u8 *buffer, +u32 buffer_size);void wilc_wlan_cfg_indicate_rx (struct wilc *wilc,u8 *frame,int size,struct wilc_cfg_rsp *rsp);int wilc_wlan_cfg_init (struct wilc *wl);
Signature · 1 line
2.19.1