Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40c99c7 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: wilc_wlan_cfg_get: pass struct wilc 



This patch passes the struct wilc to the function and use it instead of
global variable wilc_dev.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89758e13

drivers/staging/wilc1000/coreconfigurator.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ s32 wilc_send_config_pkt(struct wilc *wilc, u8 mode, struct wid *wids, 
		for (counter = 0; counter < count; counter++) {

			PRINT_INFO(CORECONFIG_DBG, "Sending CFG packet [%d][%d]\n", !counter,

				   (counter == count - 1));

			if (!wilc_wlan_cfg_get(!counter,

			if (!wilc_wlan_cfg_get(wilc, !counter,

					       wids[counter].id,

					       (counter == count - 1),

					       drv)) {

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic) 
			goto _fail_irq_enable_;

		}



		if (wilc_wlan_cfg_get(1, WID_FIRMWARE_VERSION, 1, 0)) {

		if (wilc_wlan_cfg_get(wl, 1, WID_FIRMWARE_VERSION, 1, 0)) {

			int size;

			char Firmware_ver[20];

drivers/staging/wilc1000/wilc_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -1540,10 +1540,10 @@ int wilc_wlan_cfg_set(struct wilc *wilc, int start, u32 wid, u8 *buffer, 
	return ret_size;

}



int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drv_handler)

int wilc_wlan_cfg_get(struct wilc *wilc, int start, u32 wid, int commit,

		      u32 drv_handler)

{

	wilc_wlan_dev_t *p = &g_wlan;

	struct wilc *wilc = wilc_dev;

	u32 offset;

	int ret_size;

drivers/staging/wilc1000/wilc_wlan.h

+2 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ void wilc_handle_isr(struct wilc *wilc); 
void wilc_wlan_cleanup(struct net_device *dev);

int wilc_wlan_cfg_set(struct wilc *wilc, int start, u32 wid, u8 *buffer,

		      u32 buffer_size, int commit, u32 drv_handler);

int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drv_handler);

int wilc_wlan_cfg_get(struct wilc *wilc, int start, u32 wid, int commit,

		      u32 drv_handler);

int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size);

int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,

			       u32 buffer_size, wilc_tx_complete_func_t func);