[PATCH 10/34] brcmfmac: Rename bcmerror to err
From: Ian Molton <hidden>
Date: 2017-07-19 19:11:04
Subsystem:
broadcom brcm80211 ieee802.11 wireless drivers, the rest · Maintainers:
Arend van Spriel, Linus Torvalds
Trivial cleanup of nasty variable name Signed-off-by: Ian Molton <redacted> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 7dd6af689ac8..f97b2234044f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c@@ -747,7 +747,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, u8 *data, uint size) { - int bcmerror = 0; + int err = 0; struct sk_buff *pkt; u32 sdaddr; uint dsize;
@@ -772,8 +772,8 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, /* Do the transfer(s) */ while (size) { /* Set the backplane window to include the start address */ - bcmerror = brcmf_sdiod_set_sbaddr_window(sdiodev, address); - if (bcmerror) + err = brcmf_sdiod_set_sbaddr_window(sdiodev, address); + if (err) break; brcmf_dbg(SDIO, "%s %d bytes at offset 0x%08x in window 0x%08x\n",
@@ -786,9 +786,9 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, skb_put(pkt, dsize); if (write) memcpy(pkt->data, data, dsize); - bcmerror = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_1, write, + err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_1, write, sdaddr, pkt); - if (bcmerror) { + if (err) { brcmf_err("membytes transfer failed\n"); break; }
@@ -815,7 +815,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, sdio_release_host(sdiodev->func[1]); - return bcmerror; + return err; } int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn)
--
2.11.0