aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-25 06:51:20 -0400
committerDavid S. Miller <davem@davemloft.net>2017-10-26 23:09:15 -0400
commitf6fd8918f04191a3e24a0717e97520b65a7d6c4e (patch)
tree36573a23940f39583e23528ba3be1d0fafc68ff5
parent550acfb37ffeee9ff00f7f13f087ad1c33a74b29 (diff)
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>
-rw-r--r--drivers/net/hamradio/yam.c4
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)
647 yam_start_tx(dev, yp); 647 yam_start_tx(dev, yp);
648} 648}
649 649
650static void yam_dotimer(unsigned long dummy) 650static void yam_dotimer(struct timer_list *unused)
651{ 651{
652 int i; 652 int i;
653 653
@@ -1164,7 +1164,7 @@ static int __init yam_init_driver(void)
1164 1164
1165 } 1165 }
1166 1166
1167 yam_timer.function = yam_dotimer; 1167 timer_setup(&yam_timer, yam_dotimer, 0);
1168 yam_timer.expires = jiffies + HZ / 100; 1168 yam_timer.expires = jiffies + HZ / 100;
1169 add_timer(&yam_timer); 1169 add_timer(&yam_timer);
1170 1170