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

Commit b058d4d2 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: remove SDIO_REQ_ASYNC flag 



Remove SDIO_REQ_ASYNC from brcmfmac since it is not being used.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2a5d7b02

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

+3 −11
Original line number Diff line number Diff line
@@ -453,15 +453,11 @@ static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, 
}



static int brcmf_sdcard_recv_prepare(struct brcmf_sdio_dev *sdiodev, uint fn,

				     uint flags, uint width, u32 *addr)

				     uint width, u32 *addr)

{

	uint bar0 = *addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	int err = 0;



	/* Async not implemented yet */

	if (flags & SDIO_REQ_ASYNC)

		return -ENOTSUPP;



	if (bar0 != sdiodev->sbwad) {

		err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0);

		if (err)
@@ -512,7 +508,7 @@ brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
		  fn, addr, pkt->len);



	width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;

	err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr);

	err = brcmf_sdcard_recv_prepare(sdiodev, fn, width, &addr);

	if (err)

		goto done;
@@ -536,7 +532,7 @@ int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
		  fn, addr, pktq->qlen);



	width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;

	err = brcmf_sdcard_recv_prepare(sdiodev, fn, flags, width, &addr);

	err = brcmf_sdcard_recv_prepare(sdiodev, fn, width, &addr);

	if (err)

		goto done;
@@ -581,10 +577,6 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
	brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",

		  fn, addr, pkt->len);



	/* Async not implemented yet */

	if (flags & SDIO_REQ_ASYNC)

		return -ENOTSUPP;



	if (bar0 != sdiodev->sbwad) {

		err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0);

		if (err)

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

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
#define SDIO_REQ_4BYTE	0x1

/* Fixed address (FIFO) (vs. incrementing address) */

#define SDIO_REQ_FIXED	0x2

/* Async request (vs. sync request) */

#define SDIO_REQ_ASYNC	0x4



/* Read/write to memory block (F1, no FIFO) via CMD53 (sync only).

 *   rw:       read or write (0/1)