From: Ian Molton Date: Mon, 13 Nov 2017 20:35:47 +0000 (+0100) Subject: brcmfmac: Rename bcmerror to err X-Git-Tag: v4.16-rc1~123^2~329^2~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd8a2d49e4ed321ab8e7b679499c3a98ccc5ca24;p=thirdparty%2Fkernel%2Flinux.git brcmfmac: Rename bcmerror to err Trivial cleanup of nasty variable name Signed-off-by: Ian Molton Signed-off-by: Arend van Spriel Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index 9a3f903e83834..30ab0aa7a2403 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -746,7 +746,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; @@ -771,8 +771,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", @@ -785,9 +785,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, - sdaddr, pkt); - if (bcmerror) { + err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_1, write, sdaddr, + pkt); + if (err) { brcmf_err("membytes transfer failed\n"); break; } @@ -814,7 +814,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)