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

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

brcm80211: fmac: stop using brcmf_pub in brcmf_sdbrcm_bus_watchdog 



structure brcmf_pub contains context for generic layer and should
not be used in brcmf_sdbrcm_bus_watchdog. This patch is part of
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 8d169aa0

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

+6 −6
Original line number Diff line number Diff line
@@ -3535,14 +3535,14 @@ void brcmf_sdbrcm_isr(void *arg) 
		complete(&bus->dpc_wait);

}



static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)

static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)

{

	struct brcmf_sdio *bus;

#ifdef BCMDBG

	struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);

#endif	/* BCMDBG */



	brcmf_dbg(TIMER, "Enter\n");



	bus = drvr->bus;



	/* Ignore the timer if simulating bus down */

	if (bus->sleeping)

		return false;
@@ -3586,7 +3586,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr) 
	}

#ifdef BCMDBG

	/* Poll for console output periodically */

	if (drvr->bus_if->state == BRCMF_BUS_DATA &&

	if (bus_if->state == BRCMF_BUS_DATA &&

	    bus->console_interval != 0) {

		bus->console.count += BRCMF_WD_POLL_MS;

		if (bus->console.count >= bus->console_interval) {
@@ -3801,7 +3801,7 @@ brcmf_sdbrcm_watchdog_thread(void *data) 
		if (kthread_should_stop())

			break;

		if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {

			brcmf_sdbrcm_bus_watchdog(bus->drvr);

			brcmf_sdbrcm_bus_watchdog(bus);

			/* Count the tick for reference */

			bus->drvr->tickcnt++;

		} else