[PATCH 05/21] brcmfmac: its ALWAYS 4.

[Ian Molton]

---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 1012df347c84..2b527d2a2f8a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -430,7 +430,7 @@ brcmf_sdiod_set_sbaddr_window(struct brcmf_sdio_dev 
*sdiodev, u32 address)
 }
 
 static int
-brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)
+brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
 {
        uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
        int err = 0;
@@ -445,8 +445,7 @@ brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, uint 
width, u32 *addr)
 
        *addr &= SBSDIO_SB_OFT_ADDR_MASK;
 
-       if (width == 4)
-               *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
+       *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
        return 0;
 }
@@ -472,7 +471,7 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_dev *sdiodev, u32 
addr, int *ret)
        int retval;
 
        brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
-       retval = brcmf_sdiod_addrprep(sdiodev, sizeof(data), &addr);
+       retval = brcmf_sdiod_addrprep(sdiodev, &addr);
        if (retval)
                goto done;
        retval = brcmf_sdiod_reg_read(sdiodev, addr, sizeof(data), &data);
@@ -504,7 +503,7 @@ void brcmf_sdiod_regwl(struct brcmf_sdio_dev *sdiodev, u32 
addr,
        int retval;
 
        brcmf_dbg(SDIO, "addr:0x%08x, data:0x%08x\n", addr, data);
-       retval = brcmf_sdiod_addrprep(sdiodev, sizeof(data), &addr);
+       retval = brcmf_sdiod_addrprep(sdiodev, &addr);
        if (retval)
                goto done;
 
@@ -740,7 +739,7 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sdio_dev *sdiodev, 
struct sk_buff *pkt)
 
        brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pkt->len);
 
-       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
+       err = brcmf_sdiod_addrprep(sdiodev, &addr);
        if (err)
                goto done;
 
@@ -761,7 +760,7 @@ int brcmf_sdiod_recv_chain(struct brcmf_sdio_dev *sdiodev,
        brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n",
                  addr, pktq->qlen);
 
-       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
+       err = brcmf_sdiod_addrprep(sdiodev, &addr);
        if (err)
                goto done;
 
@@ -806,7 +805,7 @@ int brcmf_sdiod_send_buf(struct brcmf_sdio_dev *sdiodev, u8 
*buf, uint nbytes)
 
        memcpy(mypkt->data, buf, nbytes);
 
-       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
+       err = brcmf_sdiod_addrprep(sdiodev, &addr);
 
        if (!err)
                err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, true, addr,
@@ -826,7 +825,7 @@ int brcmf_sdiod_send_pkt(struct brcmf_sdio_dev *sdiodev,
 
        brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pktq->qlen);
 
-       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
+       err = brcmf_sdiod_addrprep(sdiodev, &addr);
        if (err)
                return err;
 
-- 
2.11.0