UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2011-11-22 17:21:53 -08:00 committed by John W. Linville
parent 8d169aa00d
commit cad2b26b10
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -3535,14 +3535,14 @@ void brcmf_sdbrcm_isr(void *arg)
complete(&bus->dpc_wait); 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"); brcmf_dbg(TIMER, "Enter\n");
bus = drvr->bus;
/* Ignore the timer if simulating bus down */ /* Ignore the timer if simulating bus down */
if (bus->sleeping) if (bus->sleeping)
return false; return false;
@ -3586,7 +3586,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
} }
#ifdef BCMDBG #ifdef BCMDBG
/* Poll for console output periodically */ /* 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_interval != 0) {
bus->console.count += BRCMF_WD_POLL_MS; bus->console.count += BRCMF_WD_POLL_MS;
if (bus->console.count >= bus->console_interval) { if (bus->console.count >= bus->console_interval) {
@ -3801,7 +3801,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
if (kthread_should_stop()) if (kthread_should_stop())
break; break;
if (!wait_for_completion_interruptible(&bus->watchdog_wait)) { if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
brcmf_sdbrcm_bus_watchdog(bus->drvr); brcmf_sdbrcm_bus_watchdog(bus);
/* Count the tick for reference */ /* Count the tick for reference */
bus->drvr->tickcnt++; bus->drvr->tickcnt++;
} else } else