Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8e13b9 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

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: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5adfeb63

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+3 −3
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 


	incr_fix = (flags & SDIO_REQ_FIXED) ? SDIOH_DATA_FIX : SDIOH_DATA_INC;

	err = brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_READ,

					 fn, addr, width, 0, NULL, pkt);

					 fn, addr, 0, NULL, pkt);



	return err;

}
@@ -369,7 +369,7 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
		addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;



	return brcmf_sdioh_request_buffer(sdiodev, incr_fix, SDIOH_WRITE, fn,

					  addr, width, 0, NULL, pkt);

					  addr, 0, NULL, pkt);

}



int 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, 


	return brcmf_sdioh_request_buffer(sdiodev, SDIOH_DATA_INC,

		(rw ? SDIOH_WRITE : SDIOH_READ), SDIO_FUNC_1,

		addr, 4, nbytes, buf, NULL);

		addr, nbytes, buf, NULL);

}



int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −2
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 
 */

int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,

			       uint fix_inc, uint write, uint func, uint addr,

			       uint reg_width, uint buflen_u, u8 *buffer,

			       struct sk_buff *pkt)

			       uint buflen_u, u8 *buffer, struct sk_buff *pkt)

{

	int Status;

	struct sk_buff *mypkt = NULL;

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, 
/* read or write any buffer using cmd53 */

extern int

brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev,

			   uint fix_inc, uint rw, uint fnc_num,

			   u32 addr, uint regwidth,

			   uint fix_inc, uint rw, uint fnc_num, u32 addr,

			   u32 buflen, u8 *buffer, struct sk_buff *pkt);

extern int

brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc,