Commit 98ae8a0b authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman

staging: brcm80211: remove static function variable in brcmfmac

The static local variable save_ms in brcmf_sdbrcm_wd_timer() has been
removed and placed in the structure brcmf_bus definition.
Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e99cab09
...@@ -654,6 +654,7 @@ struct brcmf_bus { ...@@ -654,6 +654,7 @@ struct brcmf_bus {
struct completion watchdog_wait; struct completion watchdog_wait;
struct task_struct *watchdog_tsk; struct task_struct *watchdog_tsk;
bool wd_timer_valid; bool wd_timer_valid;
uint save_ms;
struct tasklet_struct tasklet; struct tasklet_struct tasklet;
struct task_struct *dpc_tsk; struct task_struct *dpc_tsk;
...@@ -5031,8 +5032,6 @@ brcmf_sdbrcm_watchdog(unsigned long data) ...@@ -5031,8 +5032,6 @@ brcmf_sdbrcm_watchdog(unsigned long data)
void void
brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
{ {
static uint save_ms;
/* don't start the wd until fw is loaded */ /* don't start the wd until fw is loaded */
if (bus->drvr->busstate == BRCMF_BUS_DOWN) if (bus->drvr->busstate == BRCMF_BUS_DOWN)
return; return;
...@@ -5041,14 +5040,14 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) ...@@ -5041,14 +5040,14 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
if (!wdtick && bus->wd_timer_valid == true) { if (!wdtick && bus->wd_timer_valid == true) {
del_timer_sync(&bus->timer); del_timer_sync(&bus->timer);
bus->wd_timer_valid = false; bus->wd_timer_valid = false;
save_ms = wdtick; bus->save_ms = wdtick;
return; return;
} }
if (wdtick) { if (wdtick) {
brcmf_watchdog_ms = (uint) wdtick; brcmf_watchdog_ms = (uint) wdtick;
if (save_ms != brcmf_watchdog_ms) { if (bus->save_ms != brcmf_watchdog_ms) {
if (bus->wd_timer_valid == true) if (bus->wd_timer_valid == true)
/* Stop timer and restart at new value */ /* Stop timer and restart at new value */
del_timer_sync(&bus->timer); del_timer_sync(&bus->timer);
...@@ -5067,7 +5066,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick) ...@@ -5067,7 +5066,7 @@ brcmf_sdbrcm_wd_timer(struct brcmf_bus *bus, uint wdtick)
} }
bus->wd_timer_valid = true; bus->wd_timer_valid = true;
save_ms = wdtick; bus->save_ms = wdtick;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment