[PATCH 1/1] forcedeth: replace init_timer_deferrable with setup_deferrable_timer

Subsystems: forcedeth gigabit ethernet driver, networking drivers, the rest

STALE3351d

2 messages, 2 authors, 2017-08-11 · open the first message on its own page

[PATCH 1/1] forcedeth: replace init_timer_deferrable with setup_deferrable_timer

From: Zhu Yanjun <hidden>
Date: 2017-08-10 08:11:18

Replace init_timer_deferrable with setup_deferrable_timer to simplify
the source code.

Signed-off-by: Zhu Yanjun <redacted>
---
 drivers/net/ethernet/nvidia/forcedeth.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index aa912f4..bdbfe8f 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -5629,9 +5629,8 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
 
 	setup_timer(&np->oom_kick, nv_do_rx_refill, (unsigned long)dev);
 	setup_timer(&np->nic_poll, nv_do_nic_poll, (unsigned long)dev);
-	init_timer_deferrable(&np->stats_poll);
-	np->stats_poll.data = (unsigned long) dev;
-	np->stats_poll.function = nv_do_stats_poll;	/* timer handler */
+	setup_deferrable_timer(&np->stats_poll, nv_do_stats_poll,
+			       (unsigned long)dev);
 
 	err = pci_enable_device(pci_dev);
 	if (err)
-- 
2.7.4

Re: [PATCH 1/1] forcedeth: replace init_timer_deferrable with setup_deferrable_timer

From: David Miller <davem@davemloft.net>
Date: 2017-08-11 21:27:27

From: Zhu Yanjun <redacted>
Date: Thu, 10 Aug 2017 04:13:12 -0400
Replace init_timer_deferrable with setup_deferrable_timer to simplify
the source code.

Signed-off-by: Zhu Yanjun <redacted>
Applied to net-next, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help