net: af_packet: use setup_timer() helper.

Allen Pais · davem330 · commit 2d04cfcfa2e8 · 2017-09-25T13:19:19.000-07:00
Use setup_timer function instead of initializing timer with the
function and data fields.

Signed-off-by: Allen Pais &lt;allen.lkml@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
@@ -544,9 +544,7 @@ static void prb_init_blk_timer(struct packet_sock *po,
 		struct tpacket_kbdq_core *pkc,
 		void (*func) (unsigned long))
 {
-	init_timer(&pkc->retire_blk_timer);
-	pkc->retire_blk_timer.data = (long)po;
-	pkc->retire_blk_timer.function = func;
+	setup_timer(&pkc->retire_blk_timer, func, (long)po);
 	pkc->retire_blk_timer.expires = jiffies;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -544,9 +544,7 @@ static void prb_init_blk_timer(struct packet_sock *po,`
`544`	`544`	`struct tpacket_kbdq_core *pkc,`
`545`	`545`	`void (*func) (unsigned long))`
`546`	`546`	`{`
`547`		`- init_timer(&pkc->retire_blk_timer);`
`548`		`- pkc->retire_blk_timer.data = (long)po;`
`549`		`- pkc->retire_blk_timer.function = func;`
	`547`	`+ setup_timer(&pkc->retire_blk_timer, func, (long)po);`
`550`	`548`	`pkc->retire_blk_timer.expires = jiffies;`
`551`	`549`	`}`
`552`	`550`