aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-11-22 20:21:39 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-28 14:43:29 -0500
commit5e8e13b94c7ace2ed8b2aed253211290b329eb5c (patch)
tree5a53249094c6903a3d24d0c12726b808ff30ab78
parent5adfeb632c52a6c15e98fa6465bdade6fff915d9 (diff)
brcm80211: fmac: remove width parameter from brcmf_sdioh_request_buffer
The function brcmf_sdioh_request_buffer() was requiring a parameter in its prototype that was not used within the function. It has been removed consequently. Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c6
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c3
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h3
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 9c27870a62c6..e8d1c9ebbf16 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -288,7 +288,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
288 288
289 incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC; 289 incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;
290 err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ, 290 err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,
291 fn, addr, width, 0, NULL, pkt); 291 fn, addr, 0, NULL, pkt);
292 292
293 return err; 293 return err;
294} 294}
@@ -369,7 +369,7 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
369 addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; 369 addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
370 370
371 return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn, 371 return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn,
372 addr, width, 0, NULL, pkt); 372 addr, 0, NULL, pkt);
373} 373}
374 374
375int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, 375int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
@@ -380,7 +380,7 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
380 380
381 return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC, 381 return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,
382 (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1, 382 (rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,
383 addr, 4, nbytes, buf, NULL); 383 addr, nbytes, buf, NULL);
384} 384}
385 385
386int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn) 386int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 4e75c191c290..271765cff4a6 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -333,8 +333,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,
333 */ 333 */
334int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, 334int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
335 uint fix_inc, uint write, uint func, uint addr, 335 uint fix_inc, uint write, uint func, uint addr,
336 uint reg_width, uint buflen_u, u8 *buffer, 336 uint buflen_u, u8 *buffer, struct sk_buff *pkt)
337 struct sk_buff *pkt)
338{ 337{
339 int Status; 338 int Status;
340 struct sk_buff *mypkt = NULL; 339 struct sk_buff *mypkt = NULL;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 85694ac2f420..74beffc889c1 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -247,8 +247,7 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,
247/* read or write any buffer using cmd53 */ 247/* read or write any buffer using cmd53 */
248extern int 248extern int
249brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, 249brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,
250 uint fix_inc, uint rw, uint fnc_num, 250 uint fix_inc, uint rw, uint fnc_num, u32 addr,
251 u32 addr, uint regwidth,
252 u32 buflen, u8 *buffer, struct sk_buff *pkt); 251 u32 buflen, u8 *buffer, struct sk_buff *pkt);
253extern int 252extern int
254brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 253brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,