Commit dd8a2d49 authored by Ian Molton's avatar Ian Molton Committed by Kalle Valo

brcmfmac: Rename bcmerror to err

Trivial cleanup of nasty variable name
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 12e3e74e
...@@ -746,7 +746,7 @@ int ...@@ -746,7 +746,7 @@ int
brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
u8 *data, uint size) u8 *data, uint size)
{ {
int bcmerror = 0; int err = 0;
struct sk_buff *pkt; struct sk_buff *pkt;
u32 sdaddr; u32 sdaddr;
uint dsize; uint dsize;
...@@ -771,8 +771,8 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, ...@@ -771,8 +771,8 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
/* Do the transfer(s) */ /* Do the transfer(s) */
while (size) { while (size) {
/* Set the backplane window to include the start address */ /* Set the backplane window to include the start address */
bcmerror = brcmf_sdiod_set_sbaddr_window(sdiodev, address); err = brcmf_sdiod_set_sbaddr_window(sdiodev, address);
if (bcmerror) if (err)
break; break;
brcmf_dbg(SDIO, "%s %d bytes at offset 0x%08x in window 0x%08x\n", 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, ...@@ -785,9 +785,9 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
skb_put(pkt, dsize); skb_put(pkt, dsize);
if (write) if (write)
memcpy(pkt->data, data, dsize); memcpy(pkt->data, data, dsize);
bcmerror = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_1, write, err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_1, write, sdaddr,
sdaddr, pkt); pkt);
if (bcmerror) { if (err) {
brcmf_err("membytes transfer failed\n"); brcmf_err("membytes transfer failed\n");
break; break;
} }
...@@ -814,7 +814,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, ...@@ -814,7 +814,7 @@ brcmf_sdiod_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,
sdio_release_host(sdiodev->func[1]); sdio_release_host(sdiodev->func[1]);
return bcmerror; return err;
} }
int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn) int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment