Эх сурвалжийг харах

net: wan : hdlc: use setup_timer() helper

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>
Allen Pais 8 жил өмнө
parent
commit
802be57134

+ 2 - 3
drivers/net/wan/hdlc_fr.c

@@ -1003,11 +1003,10 @@ static void fr_start(struct net_device *dev)
 		state(hdlc)->n391cnt = 0;
 		state(hdlc)->n391cnt = 0;
 		state(hdlc)->txseq = state(hdlc)->rxseq = 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 */
 		/* First poll after 1 s */
 		state(hdlc)->timer.expires = jiffies + HZ;
 		state(hdlc)->timer.expires = jiffies + HZ;
-		state(hdlc)->timer.function = fr_timer;
-		state(hdlc)->timer.data = (unsigned long)dev;
 		add_timer(&state(hdlc)->timer);
 		add_timer(&state(hdlc)->timer);
 	} else
 	} else
 		fr_set_link_state(1, dev);
 		fr_set_link_state(1, dev);