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

Commit 23a7a51c authored by Luciano Coelho's avatar Luciano Coelho Committed by John W. Linville
Browse files

wl1271: fix a bunch of sparse warnings 



A couple of sparse warnings in some rate settings (missing cpu_to_le32) were
fixed.  Changed the conf_sg_settings struct from le to native endianess.  The
values are converted to le when copying them to the acx command instead.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 82429d32

drivers/net/wireless/wl12xx/wl1271_acx.c

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ int wl1271_acx_sg_cfg(struct wl1271 *wl) 


	/* BT-WLAN coext parameters */

	for (i = 0; i < CONF_SG_PARAMS_MAX; i++)

		param->params[i] = c->params[i];

		param->params[i] = cpu_to_le32(c->params[i]);

	param->param_idx = CONF_SG_PARAMS_ALL;



	ret = wl1271_cmd_configure(wl, ACX_SG_CFG, param, sizeof(*param));

drivers/net/wireless/wl12xx/wl1271_boot.c

+4 −4
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int wl1271_boot_soft_reset(struct wl1271 *wl) 
static int wl1271_boot_run_firmware(struct wl1271 *wl)

{

	int loop, ret;

	u32 chip_id, interrupt;

	u32 chip_id, intr;



	wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
@@ -367,15 +367,15 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) 
	loop = 0;

	while (loop++ < INIT_LOOP) {

		udelay(INIT_LOOP_DELAY);

		interrupt = wl1271_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);

		intr = wl1271_read32(wl, ACX_REG_INTERRUPT_NO_CLEAR);



		if (interrupt == 0xffffffff) {

		if (intr == 0xffffffff) {

			wl1271_error("error reading hardware complete "

				     "init indication");

			return -EIO;

		}

		/* check that ACX_INTR_INIT_COMPLETE is enabled */

		else if (interrupt & WL1271_ACX_INTR_INIT_COMPLETE) {

		else if (intr & WL1271_ACX_INTR_INIT_COMPLETE) {

			wl1271_write32(wl, ACX_REG_INTERRUPT_ACK,

				       WL1271_ACX_INTR_INIT_COMPLETE);

			break;

drivers/net/wireless/wl12xx/wl1271_cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) 
	join->rx_config_options = cpu_to_le32(wl->rx_config);

	join->rx_filter_options = cpu_to_le32(wl->rx_filter);

	join->bss_type = bss_type;

	join->basic_rate_set = wl->basic_rate_set;

	join->basic_rate_set = cpu_to_le32(wl->basic_rate_set);



	if (wl->band == IEEE80211_BAND_5GHZ)

		join->bss_type |= WL1271_JOIN_CMD_BSS_TYPE_5GHZ;
@@ -614,7 +614,7 @@ int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, 
	params->params.scan_options = cpu_to_le16(scan_options);



	params->params.num_probe_requests = probe_requests;

	params->params.tx_rate = rate;

	params->params.tx_rate = cpu_to_le32(rate);

	params->params.tid_trigger = 0;

	params->params.scan_tag = WL1271_SCAN_DEFAULT_TAG;

drivers/net/wireless/wl12xx/wl1271_conf.h

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ enum { 
};



struct conf_sg_settings {

	__le32 params[CONF_SG_PARAMS_MAX];

	u32 params[CONF_SG_PARAMS_MAX];

	u8 state;

};