aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac
diff options
context:
space:
mode:
authorFranky Lin <frankyl@broadcom.com>2011-11-22 20:21:53 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-28 14:43:42 -0500
commitcad2b26b1010d0694d2f08d408486451b9f919d2 (patch)
treeda1cdec9aafdb4e495ad2629c59d1e4c4c0430a5 /drivers/net/wireless/brcm80211/brcmfmac
parent8d169aa00d0356f915e84dbdf6c9be381cce34a4 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 7c8b5f77042c..885d16a57c80 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -3535,14 +3535,14 @@ void brcmf_sdbrcm_isr(void *arg)
3535 complete(&bus->dpc_wait); 3535 complete(&bus->dpc_wait);
3536} 3536}
3537 3537
3538static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr) 3538static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus)
3539{ 3539{
3540 struct brcmf_sdio *bus; 3540#ifdef BCMDBG
3541 struct brcmf_bus *bus_if = dev_get_drvdata(bus->sdiodev->dev);
3542#endif /* BCMDBG */
3541 3543
3542 brcmf_dbg(TIMER, "Enter\n"); 3544 brcmf_dbg(TIMER, "Enter\n");
3543 3545
3544 bus = drvr->bus;
3545
3546 /* Ignore the timer if simulating bus down */ 3546 /* Ignore the timer if simulating bus down */
3547 if (bus->sleeping) 3547 if (bus->sleeping)
3548 return false; 3548 return false;
@@ -3586,7 +3586,7 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
3586 } 3586 }
3587#ifdef BCMDBG 3587#ifdef BCMDBG
3588 /* Poll for console output periodically */ 3588 /* Poll for console output periodically */
3589 if (drvr->bus_if->state == BRCMF_BUS_DATA && 3589 if (bus_if->state == BRCMF_BUS_DATA &&
3590 bus->console_interval != 0) { 3590 bus->console_interval != 0) {
3591 bus->console.count += BRCMF_WD_POLL_MS; 3591 bus->console.count += BRCMF_WD_POLL_MS;
3592 if (bus->console.count >= bus->console_interval) { 3592 if (bus->console.count >= bus->console_interval) {
@@ -3801,7 +3801,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
3801 if (kthread_should_stop()) 3801 if (kthread_should_stop())
3802 break; 3802 break;
3803 if (!wait_for_completion_interruptible(&bus->watchdog_wait)) { 3803 if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
3804 brcmf_sdbrcm_bus_watchdog(bus->drvr); 3804 brcmf_sdbrcm_bus_watchdog(bus);
3805 /* Count the tick for reference */ 3805 /* Count the tick for reference */
3806 bus->drvr->tickcnt++; 3806 bus->drvr->tickcnt++;
3807 } else 3807 } else