diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-25 03:51:20 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-27 12:09:15 +0900 |
| commit | f6fd8918f04191a3e24a0717e97520b65a7d6c4e (patch) | |
| tree | 36573a23940f39583e23528ba3be1d0fafc68ff5 /drivers/net/hamradio/yam.c | |
| parent | drivers/net: can: Convert timers to use timer_setup() (diff) | |
| download | linux-dev-f6fd8918f04191a3e24a0717e97520b65a7d6c4e.tar.xz linux-dev-f6fd8918f04191a3e24a0717e97520b65a7d6c4e.zip | |
drivers/net: hamradio/yam: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Initialization was entirely missing.
Cc: Jean-Paul Roubelat <jpr@f6fbb.org>
Cc: linux-hams@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/hamradio/yam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 7a7c5224a336..b88c5cc00a63 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -647,7 +647,7 @@ static void yam_arbitrate(struct net_device *dev) yam_start_tx(dev, yp); } -static void yam_dotimer(unsigned long dummy) +static void yam_dotimer(struct timer_list *unused) { int i; @@ -1164,7 +1164,7 @@ static int __init yam_init_driver(void) } - yam_timer.function = yam_dotimer; + timer_setup(&yam_timer, yam_dotimer, 0); yam_timer.expires = jiffies + HZ / 100; add_timer(&yam_timer); |