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

brcmfmac: remove regs parameter from sdio probe functions 



The chip recognition requires a base address that was provided
to it during the probe. However, the address is a fixed define
value so it is unnecessary to pass through the probe functions.

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 1cee05e3

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

+1 −4
Original line number Diff line number Diff line
@@ -992,17 +992,14 @@ static int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev) 


static int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)

{

	u32 regs = 0;

	int ret = 0;



	ret = brcmf_sdioh_attach(sdiodev);

	if (ret)

		goto out;



	regs = SI_ENUM_BASE;



	/* try to attach to the target device */

	sdiodev->bus = brcmf_sdbrcm_probe(regs, sdiodev);

	sdiodev->bus = brcmf_sdbrcm_probe(sdiodev);

	if (!sdiodev->bus) {

		brcmf_err("device attach failed\n");

		ret = -ENODEV;

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

+4 −7
Original line number Diff line number Diff line
@@ -3803,7 +3803,7 @@ static bool brcmf_sdbrcm_probe_malloc(struct brcmf_sdio *bus) 
}



static bool

brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva)

brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus)

{

	u8 clkctl = 0;

	int err = 0;
@@ -3835,7 +3835,7 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) 
		goto fail;

	}



	if (brcmf_sdio_chip_attach(bus->sdiodev, &bus->ci, regsva)) {

	if (brcmf_sdio_chip_attach(bus->sdiodev, &bus->ci)) {

		brcmf_err("brcmf_sdio_chip_attach failed!\n");

		goto fail;

	}
@@ -4037,16 +4037,13 @@ static struct brcmf_bus_ops brcmf_sdio_bus_ops = { 
	.gettxq = brcmf_sdbrcm_bus_gettxq,

};



void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)

void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev)

{

	int ret;

	struct brcmf_sdio *bus;



	brcmf_dbg(TRACE, "Enter\n");



	/* We make an assumption about address window mappings:

	 * regsva == SI_ENUM_BASE*/



	/* Allocate private bus interface state */

	bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);

	if (!bus)
@@ -4080,7 +4077,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev) 
	}



	/* attempt to attach to the dongle */

	if (!(brcmf_sdbrcm_probe_attach(bus, regsva))) {

	if (!(brcmf_sdbrcm_probe_attach(bus))) {

		brcmf_err("brcmf_sdbrcm_probe_attach failed\n");

		goto fail;

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static inline int brcmf_sdio_chip_cichk(struct chip_info *ci) 
#endif



static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,

				       struct chip_info *ci, u32 regs)

				       struct chip_info *ci)

{

	u32 regdata;

	int ret;
@@ -449,7 +449,7 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev, 
	 * other ways of recognition should be added here.

	 */

	ci->c_inf[0].id = BCMA_CORE_CHIPCOMMON;

	ci->c_inf[0].base = regs;

	ci->c_inf[0].base = SI_ENUM_BASE;

	regdata = brcmf_sdio_regrl(sdiodev,

				   CORE_CC_REG(ci->c_inf[0].base, chipid),

				   NULL);
@@ -681,7 +681,7 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev, 
}



int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

			   struct chip_info **ci_ptr, u32 regs)

			   struct chip_info **ci_ptr)

{

	int ret;

	struct chip_info *ci;
@@ -697,7 +697,7 @@ int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev, 
	if (ret != 0)

		goto err;



	ret = brcmf_sdio_chip_recognition(sdiodev, ci, regs);

	ret = brcmf_sdio_chip_recognition(sdiodev, ci);

	if (ret != 0)

		goto err;

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

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ struct sdpcmd_regs { 
};



int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

			   struct chip_info **ci_ptr, u32 regs);

			   struct chip_info **ci_ptr);

void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);

void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,

				       struct chip_info *ci, u32 drivestrength);

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

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address, 
/* Issue an abort to the specified function */

int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);



void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);

void *brcmf_sdbrcm_probe(struct brcmf_sdio_dev *sdiodev);

void brcmf_sdbrcm_disconnect(void *ptr);

void brcmf_sdbrcm_isr(void *arg);