From: Zhu Yanjun Date: Thu, 10 Aug 2017 08:13:12 +0000 (-0400) Subject: forcedeth: replace init_timer_deferrable with setup_deferrable_timer X-Git-Tag: v4.14-rc1~130^2~285 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d24d39d906fa8944024f154e0ea3f031252c06c1;p=platform%2Fkernel%2Flinux-rpi.git forcedeth: replace init_timer_deferrable with setup_deferrable_timer Replace init_timer_deferrable with setup_deferrable_timer to simplify the source code. Signed-off-by: Zhu Yanjun Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index aa912f4..994a83a1 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)