62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
|
From 4a3338ba2a7421db2260159cca5a27bd2ee36d00 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ian Molton <ian@mnementh.co.uk>
|
||
|
|
Date: Mon, 13 Nov 2017 21:35:43 +0100
|
||
|
|
Subject: [PATCH] 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: Ian Molton <ian@mnementh.co.uk>
|
||
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
.../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 28 +---------------------
|
||
|
|
1 file changed, 1 insertion(+), 27 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
|
||
|
|
@@ -334,21 +334,8 @@ static int brcmf_sdiod_reg_write(struct
|
||
|
|
} 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 b
|
||
|
|
|
||
|
|
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;
|
||
|
|
}
|