1 From ea243e9077b3545f20d93884e91c50ac0719685a Mon Sep 17 00:00:00 2001
2 From: Ian Molton <ian@mnementh.co.uk>
3 Date: Mon, 13 Nov 2017 21:35:42 +0100
4 Subject: [PATCH] brcmfmac: Remove dead IO code
6 The value passed to brcmf_sdiod_addrprep() is *always* 4
7 remove this parameter and the unused code to handle it.
9 Signed-off-by: Ian Molton <ian@mnementh.co.uk>
10 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 18 ++++++++----------
14 1 file changed, 8 insertions(+), 10 deletions(-)
16 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
17 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
18 @@ -425,7 +425,7 @@ brcmf_sdiod_set_sbaddr_window(struct brc
22 -brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)
23 +brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
25 uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
27 @@ -439,9 +439,7 @@ brcmf_sdiod_addrprep(struct brcmf_sdio_d
30 *addr &= SBSDIO_SB_OFT_ADDR_MASK;
33 - *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
34 + *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
38 @@ -467,7 +465,7 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_
41 brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
42 - retval = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
43 + retval = brcmf_sdiod_addrprep(sdiodev, &addr);
47 @@ -500,7 +498,7 @@ void brcmf_sdiod_regwl(struct brcmf_sdio
50 brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
51 - retval = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
52 + retval = brcmf_sdiod_addrprep(sdiodev, &addr);
56 @@ -736,7 +734,7 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sd
58 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pkt->len);
60 - err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
61 + err = brcmf_sdiod_addrprep(sdiodev, &addr);
65 @@ -757,7 +755,7 @@ int brcmf_sdiod_recv_chain(struct brcmf_
66 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n",
69 - err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
70 + err = brcmf_sdiod_addrprep(sdiodev, &addr);
74 @@ -801,7 +799,7 @@ int brcmf_sdiod_send_buf(struct brcmf_sd
76 memcpy(mypkt->data, buf, nbytes);
78 - err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
79 + err = brcmf_sdiod_addrprep(sdiodev, &addr);
82 err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, true, addr,
83 @@ -821,7 +819,7 @@ int brcmf_sdiod_send_pkt(struct brcmf_sd
85 brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pktq->qlen);
87 - err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
88 + err = brcmf_sdiod_addrprep(sdiodev, &addr);