Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+7 −7
Original line number Diff line number Diff line
@@ -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)