From f6fd8918f04191a3e24a0717e97520b65a7d6c4e Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 25 Oct 2017 03:51:20 -0700 Subject: 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 Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook Signed-off-by: David S. Miller --- drivers/net/hamradio/yam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/hamradio/yam.c') 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); -- cgit v1.2.3