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

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

brcm80211: fmac: remove unused parameter of brcmf_sdbrcm_probe 



bus_no, slot, func and bustype are no longer needed by brcmf_sdbrcm_probe.
This patch removes them.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-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 4f96bf19

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
	sdiodev->sbwad = SI_ENUM_BASE;

	sdiodev->sbwad = SI_ENUM_BASE;





	/* try to attach to the target device */

	/* try to attach to the target device */

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

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

	if (!sdiodev->bus) {

	if (!sdiodev->bus) {

		brcmf_dbg(ERROR, "device attach failed\n");

		brcmf_dbg(ERROR, "device attach failed\n");

		ret = -ENODEV;

		ret = -ENODEV;

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -3861,8 +3861,7 @@ static void brcmf_sdbrcm_release(struct brcmf_bus *bus) 
	brcmf_dbg(TRACE, "Disconnected\n");

	brcmf_dbg(TRACE, "Disconnected\n");

}

}





void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,

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

			 u32 regsva, struct brcmf_sdio_dev *sdiodev)

{

{

	int ret;

	int ret;

	struct brcmf_bus *bus;

	struct brcmf_bus *bus;

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -258,8 +258,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 
extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,

extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,

				    bool enable);

				    bool enable);





extern void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,

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

				u32 regsva, struct brcmf_sdio_dev *sdiodev);

extern void brcmf_sdbrcm_disconnect(void *ptr);

extern void brcmf_sdbrcm_disconnect(void *ptr);

extern void brcmf_sdbrcm_isr(void *arg);

extern void brcmf_sdbrcm_isr(void *arg);

#endif				/* _BRCM_SDH_H_ */
 
#endif				/* _BRCM_SDH_H_ */