Message ID | 20170512093259.28479-1-cheerx1994@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 6572e5f72d01121f21734a1309dac2ecd7bbff95 |
Delegated to: | Kalle Valo |
Headers | show |
Xie Qirong <cheerx1994@gmail.com> wrote: > setup_timer.cocci suggested the following improvement: > drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c:383:1-11: Use > setup_timer function for function on line 384. > > The combination of init_timer and setting up the data and function field > manually is equivalent to calling setup_timer(). This is an api > consolidation only and improves readability. > > Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Xie Qirong <cheerx1994@gmail.com> Patch applied to wireless-drivers-next.git, thanks. 6572e5f72d01 brcmfmac: btcoex: replace init_timer with setup_timer
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c index 14a70d4b4e86..3559fb5b8fb0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c @@ -380,9 +380,7 @@ int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg) /* Set up timer for BT */ btci->timer_on = false; btci->timeout = BRCMF_BTCOEX_OPPR_WIN_TIME; - init_timer(&btci->timer); - btci->timer.data = (ulong)btci; - btci->timer.function = brcmf_btcoex_timerfunc; + setup_timer(&btci->timer, brcmf_btcoex_timerfunc, (ulong)btci); btci->cfg = cfg; btci->saved_regs_part1 = false; btci->saved_regs_part2 = false;