]> git.baikalelectronics.ru Git - kernel.git/commitdiff
forcedeth: replace init_timer_deferrable with setup_deferrable_timer
authorZhu Yanjun <yanjun.zhu@oracle.com>
Thu, 10 Aug 2017 08:13:12 +0000 (04:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Aug 2017 21:25:35 +0000 (14:25 -0700)
Replace init_timer_deferrable with setup_deferrable_timer to simplify
the source code.

Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/nvidia/forcedeth.c

index aa912f43e15f88140f1e84e816ab1fe3e7662642..994a83a1f0a5c5ae31a43b550ac7a2f1afee8ca3 100644 (file)
@@ -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)