Commit 4a3338ba authored by Ian Molton's avatar Ian Molton Committed by Kalle Valo
Browse files

brcmfmac: Remove bandaid for SleepCSR 



Register access code is not the place for band-aid fixes like this.
If this is a genuine problem, it should be fixed further up in the driver
stack.

Signed-off-by: default avatarIan Molton <ian@mnementh.co.uk>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ea243e90

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+1 −27
Original line number Diff line number Diff line
@@ -334,21 +334,8 @@ static int brcmf_sdiod_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, 
	} while (ret != 0 && ret != -ENOMEDIUM &&

		 retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);



	if (ret == -ENOMEDIUM) {

	if (ret == -ENOMEDIUM)

		brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);

	} else if (ret != 0) {

		/*

		 * SleepCSR register access can fail when

		 * waking up the device so reduce this noise

		 * in the logs.

		 */

		if (addr != SBSDIO_FUNC1_SLEEPCSR)

			brcmf_err("failed to write data F%d@0x%05x, err: %d\n",

				  func, addr, ret);

		else

			brcmf_dbg(SDIO, "failed to write data F%d@0x%05x, err: %d\n",

				  func, addr, ret);

	}



	return ret;

}
@@ -389,19 +376,6 @@ static int brcmf_sdiod_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, 


	if (ret == -ENOMEDIUM)

		brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_NOMEDIUM);

	else if (ret != 0) {

		/*

		 * SleepCSR register access can fail when

		 * waking up the device so reduce this noise

		 * in the logs.

		 */

		if (addr != SBSDIO_FUNC1_SLEEPCSR)

			brcmf_err("failed to read data F%d@0x%05x, err: %d\n",

				  func, addr, ret);

		else

			brcmf_dbg(SDIO, "failed to read data F%d@0x%05x, err: %d\n",

				  func, addr, ret);

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE