| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 |
- From dd8a2d49e4ed321ab8e7b679499c3a98ccc5ca24 Mon Sep 17 00:00:00 2001
- From: Ian Molton <[email protected]>
- Date: Mon, 13 Nov 2017 21:35:47 +0100
- Subject: [PATCH] brcmfmac: Rename bcmerror to err
- Trivial cleanup of nasty variable name
- Signed-off-by: Ian Molton <[email protected]>
- Signed-off-by: Arend van Spriel <[email protected]>
- Signed-off-by: Kalle Valo <[email protected]>
- ---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
- --- 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
- /* 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
- 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
-
- sdio_release_host(sdiodev->func[1]);
-
- - return bcmerror;
- + return err;
- }
-
- int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, u8 fn)
|
