From: Ian Molton <ian@mnementh.co.uk>
To: linux-wireless@vger.kernel.org
Cc: arend.vanspriel@broadcom.com, franky.lin@broadcom.com,
hante.meuleman@broadcom.com
Subject: [PATCH 05/34] brcmfmac: Remove dead IO code
Date: Wed, 26 Jul 2017 21:25:28 +0100 [thread overview]
Message-ID: <20170726202557.15632-6-ian@mnementh.co.uk> (raw)
In-Reply-To: <20170726202557.15632-1-ian@mnementh.co.uk>
The value passed to brcmf_sdiod_addrprep() is *always* 4
remove this parameter and the unused code to handle it.
Signed-off-by: Ian Molton <ian@mnementh.co.uk>
---
.../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 7b2184d1e365..609a934c1658 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -425,7 +425,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;
@@ -439,9 +439,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;
}
@@ -467,7 +465,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, 4, &addr);
+ retval = brcmf_sdiod_addrprep(sdiodev, &addr);
if (retval)
goto done;
@@ -500,7 +498,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, 4, &addr);
+ retval = brcmf_sdiod_addrprep(sdiodev, &addr);
if (retval)
goto done;
@@ -736,7 +734,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;
@@ -757,7 +755,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;
@@ -801,7 +799,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,
@@ -821,7 +819,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
next prev parent reply other threads:[~2017-07-26 20:26 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-26 20:25 Patch v4: Clean up brcmfmac driver Ian Molton
2017-07-26 20:25 ` [PATCH 01/34] brcmfmac: Fix parameter order in brcmf_sdiod_f0_writeb() Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-19 19:52 ` Ian Molton
2017-07-26 20:25 ` [PATCH 02/34] brcmfmac: Register sizes on hardware are not dependent on compiler types Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 03/34] brcmfmac: Split brcmf_sdiod_regrw_helper() up Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-07 17:49 ` Ian Molton
2017-07-26 20:25 ` [PATCH 04/34] brcmfmac: Clean up brcmf_sdiod_set_sbaddr_window() Ian Molton
2017-08-05 20:08 ` Arend van Spriel
2017-07-26 20:25 ` Ian Molton [this message]
2017-08-07 11:25 ` [PATCH 05/34] brcmfmac: Remove dead IO code Arend van Spriel
2017-07-26 20:25 ` [PATCH 06/34] brcmfmac: Remove bandaid for SleepCSR Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-19 20:57 ` Ian Molton
2017-07-26 20:25 ` [PATCH 07/34] brcmfmac: Remove brcmf_sdiod_request_data() Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-07 17:51 ` Ian Molton
2017-08-19 20:02 ` Ian Molton
2017-08-30 19:32 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 08/34] brcmfmac: Fix uninitialised variable Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 21:06 ` Ian Molton
2017-07-26 20:25 ` [PATCH 09/34] brcmfmac: Remove noisy debugging Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 20:18 ` Ian Molton
2017-07-26 20:25 ` [PATCH 10/34] brcmfmac: Rename bcmerror to err Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 11/34] brcmfmac: Split brcmf_sdiod_buffrw function up Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 21:41 ` Ian Molton
2017-07-26 20:25 ` [PATCH 12/34] brcmfmac: Replace old IO functions with simpler ones Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-07 17:55 ` Ian Molton
2017-08-19 21:50 ` Ian Molton
2017-07-26 20:25 ` [PATCH 13/34] brcmfmac: Tidy register definitions a little Ian Molton
2017-08-07 19:30 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 14/34] brcmfmac: Remove brcmf_sdiod_addrprep() Ian Molton
2017-08-07 11:27 ` Arend van Spriel
2017-08-19 20:27 ` Ian Molton
2017-07-26 20:25 ` [PATCH 15/34] brcmfamc: remove unnecessary call to brcmf_sdiod_set_backplane_window() Ian Molton
2017-08-07 11:11 ` Arend van Spriel
2017-08-07 11:54 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 16/34] brcmfmac: Cleanup offsetof() Ian Molton
2017-07-26 20:25 ` [PATCH 17/34] brcmfmac: Remove unused macro Ian Molton
2017-07-26 20:25 ` [PATCH 18/34] brcmfmac: Rename SOC_AI to SOC_AXI Ian Molton
2017-07-26 20:25 ` [PATCH 19/34] brcmfmac: Get rid of chip_priv and core_priv structs Ian Molton
2017-07-29 10:12 ` kbuild test robot
2017-07-26 20:25 ` [PATCH 20/34] brcmfmac: Whitespace patch Ian Molton
2017-07-26 20:25 ` [PATCH 21/34] brcmfmac: Simplify chip probe routine Ian Molton
2017-07-26 20:25 ` [PATCH 22/34] brcmfmac: Rename axi functions for clarity Ian Molton
2017-07-26 20:25 ` [PATCH 23/34] brcmfmac: HUGE cleanup of IO access functions Ian Molton
2017-07-26 20:25 ` [PATCH 24/34] brcmfmac: Rename chip.ctx -> chip.bus_priv Ian Molton
2017-07-26 20:25 ` [PATCH 25/34] brcmfmac: Remove repeated calls to brcmf_chip_get_core() Ian Molton
2017-07-26 20:25 ` [PATCH 26/34] brcmfmac: General cleaning up. whitespace and comments fix Ian Molton
2017-07-26 20:25 ` [PATCH 27/34] brcmfmac: Remove {r,w}_sdreg32 Ian Molton
2017-07-26 20:25 ` [PATCH 28/34] brcmfmac: Rename buscore->core for consistency Ian Molton
2017-07-26 20:25 ` [PATCH 29/34] brcmfmac: stabilise the value of ->sbwad in use for some xfer routines Ian Molton
2017-08-07 12:32 ` Arend van Spriel
2017-08-19 20:31 ` Ian Molton
2017-07-26 20:25 ` [PATCH 30/34] brcmfmac: Correctly handle accesses to SDIO func0 Ian Molton
2017-08-08 12:36 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 31/34] brcmfmac: Remove func0 from function array Ian Molton
2017-08-08 11:19 ` Arend van Spriel
2017-08-08 11:27 ` Ian Molton
2017-08-08 12:33 ` Arend van Spriel
2017-08-19 20:33 ` Ian Molton
2017-07-26 20:25 ` [PATCH 32/34] brcmfmac: Replace function index with function pointer Ian Molton
2017-07-28 15:55 ` [PATCH] brcmfmac: fix semicolon.cocci warnings kbuild test robot
2017-07-28 15:55 ` [PATCH 32/34] brcmfmac: Replace function index with function pointer kbuild test robot
2017-08-08 12:29 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 33/34] brcmfmac: Remove array of functions Ian Molton
2017-08-08 12:29 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 34/34] brcmfmac: Reduce the noise from repeatedly dereferencing common pointers Ian Molton
2017-08-08 12:29 ` Arend van Spriel
2017-08-19 20:39 ` Ian Molton
2017-07-27 6:17 ` Patch v4: Clean up brcmfmac driver Kalle Valo
2017-07-27 9:47 ` Ian Molton
2017-07-27 9:52 ` Arend van Spriel
2017-07-27 10:00 ` Ian Molton
2017-07-27 10:09 ` Arend van Spriel
2017-07-27 10:12 ` Ian Molton
2017-07-27 10:31 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2017-07-19 19:07 PATCH v3 brcmfmac driver cleanup Ian Molton
2017-07-19 19:07 ` [PATCH 05/34] brcmfmac: Remove dead IO code Ian Molton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170726202557.15632-6-ian@mnementh.co.uk \
--to=ian@mnementh.co.uk \
--cc=arend.vanspriel@broadcom.com \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).