OSDN Git Service

net: wan : hdlc: use setup_timer() helper
authorAllen Pais <allen.lkml@gmail.com>
Thu, 21 Sep 2017 12:47:55 +0000 (18:17 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Sep 2017 22:48:46 +0000 (15:48 -0700)
Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/hdlc_fr.c

index 78596e4..425a47f 100644 (file)
@@ -1003,11 +1003,10 @@ static void fr_start(struct net_device *dev)
                state(hdlc)->n391cnt = 0;
                state(hdlc)->txseq = state(hdlc)->rxseq = 0;
 
-               init_timer(&state(hdlc)->timer);
+               setup_timer(&state(hdlc)->timer, fr_timer,
+                           (unsigned long)dev);
                /* First poll after 1 s */
                state(hdlc)->timer.expires = jiffies + HZ;
-               state(hdlc)->timer.function = fr_timer;
-               state(hdlc)->timer.data = (unsigned long)dev;
                add_timer(&state(hdlc)->timer);
        } else
                fr_set_link_state(1, dev);