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

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

brcm80211: fmac: change function bus_init parameter 



Change parameter to device pointer for bus layer interface function
brcmf_sdbrcm_bus_init. This is part of the fullmac bus interface
refactoring.

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 avatarJohn W. Linville <linville@tuxdriver.com>
parent bf347bb9

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ extern struct device *brcmf_bus_get_device(struct brcmf_sdio *bus); 
extern void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus);



/* Initialize bus module: prepare for communication w/dongle */

extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr);

extern int brcmf_sdbrcm_bus_init(struct device *dev);



/* Send a data frame to the dongle.  Callee disposes of txp. */

extern int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *txp);

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

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ int brcmf_bus_start(struct brcmf_pub *drvr) 
	brcmf_dbg(TRACE, "\n");



	/* Bring up the bus */

	ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub);

	ret = brcmf_sdbrcm_bus_init(drvr_priv->pub.dev);

	if (ret != 0) {

		brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);

		return ret;

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

+7 −5
Original line number Diff line number Diff line
@@ -3408,9 +3408,11 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_sdio *bus) 
	up(&bus->sdsem);

}



int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)

int brcmf_sdbrcm_bus_init(struct device *dev)

{

	struct brcmf_sdio *bus = drvr->bus;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;

	struct brcmf_sdio *bus = sdiodev->bus;

	unsigned long timeout;

	uint retries = 0;

	u8 ready, enable;
@@ -3420,7 +3422,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr) 
	brcmf_dbg(TRACE, "Enter\n");



	/* try to download image and nvram to the dongle */

	if (drvr->bus_if->state == BRCMF_BUS_DOWN) {

	if (bus_if->state == BRCMF_BUS_DOWN) {

		if (!(brcmf_sdbrcm_download_firmware(bus)))

			return -1;

	}
@@ -3486,7 +3488,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr) 
				       SBSDIO_WATERMARK, 8, &err);



		/* Set bus state according to enable result */

		drvr->bus_if->state = BRCMF_BUS_DATA;

		bus_if->state = BRCMF_BUS_DATA;

	}



	else {
@@ -3501,7 +3503,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr) 
			       SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);



	/* If we didn't come up, turn off backplane clock */

	if (drvr->bus_if->state != BRCMF_BUS_DATA)

	if (bus_if->state != BRCMF_BUS_DATA)

		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);



exit: