drivers/net: hamradio/yam: Convert timers to use timer_setup()
authorKees Cook <keescook@chromium.org>
Wed, 25 Oct 2017 10:51:20 +0000 (03:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Oct 2017 03:09:15 +0000 (12:09 +0900)
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>
drivers/net/hamradio/yam.c

index 7a7c5224a3368785fa046640edfbf0888c0d4128..b88c5cc00a6320ae3e241c8afcd569ec2d9e73e7 100644 (file)
@@ -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);