Commit 4ad36601 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

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: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190712072009.2550-1-nishkadg.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68336404

drivers/staging/wilc1000/wilc_netdev.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ 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,

int wilc_wlan_cfg_get_val(struct wilc *wl, u16 wid, u8 *buffer,

			  u32 buffer_size)

{

	u32 type = (wid >> 12) & 0xf;

drivers/staging/wilc1000/wilc_wlan_cfg.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 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,

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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE