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

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

brcmfmac: remove brcmf_sdio_regrw_helper() from header file 



Make brcmf_sdio_regrw_helper() static removing its use outside of
the bcmsdh.c source file.

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

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

+2 −3
Original line number Diff line number Diff line
@@ -369,8 +369,7 @@ brcmf_sdio_addrprep(struct brcmf_sdio_dev *sdiodev, uint width, u32 *addr) 
	return 0;

}



int

brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,

static int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,

				   void *data, bool write)

{

	u8 func_num, reg_size;

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

+2 −2
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus) 
	addr = bus->ci->c_inf[idx].base +

	       offsetof(struct sdpcmd_regs, intstatus);



	ret = brcmf_sdio_regrw_helper(bus->sdiodev, addr, &val, false);

	val = brcmf_sdio_regrl(bus->sdiodev, addr, &ret);

	bus->sdcnt.f1regdata++;

	if (ret != 0)

		val = 0;
@@ -2326,7 +2326,7 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus) 


	/* Clear interrupts */

	if (val) {

		ret = brcmf_sdio_regrw_helper(bus->sdiodev, addr, &val, true);

		brcmf_sdio_regwl(bus->sdiodev, addr, val, &ret);

		bus->sdcnt.f1regdata++;

	}

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

+0 −2
Original line number Diff line number Diff line
@@ -194,8 +194,6 @@ void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr, u8 data, 
		      int *ret);

void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, u32 data,

		      int *ret);

int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,

			    void *data, bool write);



/* Buffer transfer to/from device (client) core via cmd53.

 *   fn:       function number