diff options
| author |   Franky Lin <frankyl@broadcom.com> | 2012-05-04 18:27:29 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2012-05-15 17:27:55 -0400 |
| commit | ce454e88289b54b0ccb8341007137f4df77123fd (patch) | |
| tree | 16d3c90546428cf61ec091664a2c604d5feb18d6 /drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | |
| parent | brcmfmac: remove unused parameter of brcmf_sdcard_reg_read (diff) | |
| download | linux-dev-ce454e88289b54b0ccb8341007137f4df77123fd.tar.xz linux-dev-ce454e88289b54b0ccb8341007137f4df77123fd.zip | |
brcmfmac: remove unused parameter of brcmf_sdcard_reg_write
The size parameter for brcmf_sdcard_reg_write is always 4. Remove it
to make the code cleaner.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c index 9966cf25320a..7c9bc2b3001a 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c @@ -254,15 +254,14 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr) } } -u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size, - u32 data) +u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, u32 data) { int status; uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; int err = 0; - brcmf_dbg(INFO, "fun = 1, addr = 0x%x, uint%ddata = 0x%x\n", - addr, size * 8, data); + brcmf_dbg(INFO, "fun = 1, addr = 0x%x, uint32data = 0x%x\n", + addr, data); if (bar0 != sdiodev->sbwad) { err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0); @@ -273,18 +272,17 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size, } addr &= SBSDIO_SB_OFT_ADDR_MASK; - if (size == 4) - addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; + addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; status = brcmf_sdioh_request_word(sdiodev, SDIOH_WRITE, SDIO_FUNC_1, - addr, &data, size); + addr, &data, 4); sdiodev->regfail = (status != 0); if (status == 0) return 0; - brcmf_dbg(ERROR, "error writing 0x%08x to addr 0x%04x size %d\n", - data, addr, size); + brcmf_dbg(ERROR, "error writing 0x%08x to addr 0x%04x\n", + data, addr); return 0xFFFFFFFF; } |