[PATCH 1/1] wireless: broadcom: brcm80211: use setup_timer() helper

From	Allen Pais <allen.lkml@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/1] wireless: broadcom: brcm80211: use setup_timer() helper
Date	2017-09-21 14:50 +0200
Message-ID	<us95w-13h-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

    Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 613caca..5adce0e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4144,10 +4144,8 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
 	init_waitqueue_head(&bus->dcmd_resp_wait);
 
 	/* Set up the watchdog timer */
-	init_timer(&bus->timer);
-	bus->timer.data = (unsigned long)bus;
-	bus->timer.function = brcmf_sdio_watchdog;
-
+	setup_timer(&bus->timer, brcmf_sdio_watchdog,
+		    (unsigned long)bus);
 	/* Initialize watchdog thread */
 	init_completion(&bus->watchdog_wait);
 	bus->watchdog_tsk = kthread_run(brcmf_sdio_watchdog_thread,
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/1] wireless: broadcom: brcm80211: use setup_timer() helper Allen Pais <allen.lkml@gmail.com> - 2017-09-21 14:50 +0200
  Re: [PATCH 1/1] wireless: broadcom: brcm80211: use setup_timer() helper Kalle Valo <kvalo@codeaurora.org> - 2017-09-21 17:00 +0200
  Re: [1/1] wireless: broadcom: brcm80211: use setup_timer() helper Kalle Valo <kvalo@codeaurora.org> - 2017-09-25 09:50 +0200
  Re: [1/1] wireless: broadcom: brcm80211: use setup_timer() helper Allen <allen.lkml@gmail.com> - 2017-09-25 10:00 +0200
    Re: [1/1] wireless: broadcom: brcm80211: use setup_timer() helper Kalle Valo <kvalo@codeaurora.org> - 2017-09-25 10:10 +0200
      Re: [1/1] wireless: broadcom: brcm80211: use setup_timer() helper Allen <allen.lkml@gmail.com> - 2017-09-25 10:30 +0200
  Re: [1/1] brcmfmac: use setup_timer() helper Kalle Valo <kvalo@codeaurora.org> - 2017-09-25 10:30 +0200

csiph-web