package/kernel/mac80211/patches/311-v4.16-0005-brcmfmac-Remove-dead-IO-code.patch

   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
   5
   6 The value passed to brcmf_sdiod_addrprep() is *always* 4
   7 remove this parameter and the unused code to handle it.
   8
   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>
  12 ---
  13  .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 18 ++++++++----------
  14  1 file changed, 8 insertions(+), 10 deletions(-)
  15
  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
  19  }
  20
  21  static int
  22 -brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr)
  23 +brcmf_sdiod_addrprep(struct brcmf_sdio_dev *sdiodev, u32 *addr)
  24  {
  25         uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;
  26         int err = 0;
  27 @@ -439,9 +439,7 @@ brcmf_sdiod_addrprep(struct brcmf_sdio_d
  28         }
  29
  30         *addr &= SBSDIO_SB_OFT_ADDR_MASK;
  31 -
  32 -       if (width == 4)
  33 -               *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
  34 +       *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
  35
  36         return 0;
  37  }
  38 @@ -467,7 +465,7 @@ u32 brcmf_sdiod_regrl(struct brcmf_sdio_
  39         int retval;
  40
  41         brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
  42 -       retval = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
  43 +       retval = brcmf_sdiod_addrprep(sdiodev, &addr);
  44         if (retval)
  45                 goto done;
  46
  47 @@ -500,7 +498,7 @@ void brcmf_sdiod_regwl(struct brcmf_sdio
  48         int retval;
  49
  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);
  53         if (retval)
  54                 goto done;
  55
  56 @@ -736,7 +734,7 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sd
  57
  58         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pkt->len);
  59
  60 -       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
  61 +       err = brcmf_sdiod_addrprep(sdiodev, &addr);
  62         if (err)
  63                 goto done;
  64
  65 @@ -757,7 +755,7 @@ int brcmf_sdiod_recv_chain(struct brcmf_
  66         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n",
  67                   addr, pktq->qlen);
  68
  69 -       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
  70 +       err = brcmf_sdiod_addrprep(sdiodev, &addr);
  71         if (err)
  72                 goto done;
  73
  74 @@ -801,7 +799,7 @@ int brcmf_sdiod_send_buf(struct brcmf_sd
  75
  76         memcpy(mypkt->data, buf, nbytes);
  77
  78 -       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
  79 +       err = brcmf_sdiod_addrprep(sdiodev, &addr);
  80
  81         if (!err)
  82                 err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, true, addr,
  83 @@ -821,7 +819,7 @@ int brcmf_sdiod_send_pkt(struct brcmf_sd
  84
  85         brcmf_dbg(SDIO, "addr = 0x%x, size = %d\n", addr, pktq->qlen);
  86
  87 -       err = brcmf_sdiod_addrprep(sdiodev, 4, &addr);
  88 +       err = brcmf_sdiod_addrprep(sdiodev, &addr);
  89         if (err)
  90                 return err;
  91