aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorZhu Yanjun <yanjun.zhu@oracle.com>2017-08-10 04:13:12 -0400
committerDavid S. Miller <davem@davemloft.net>2017-08-11 14:25:35 -0700
commitd24d39d906fa8944024f154e0ea3f031252c06c1 (patch)
treeed184f7b4943fd7f23ab0a88117261a946c916b9 /drivers/net/ethernet
parentdrivers: net: davinci_mdio: print bus frequency (diff)
downloadlinux-dev-d24d39d906fa8944024f154e0ea3f031252c06c1.tar.xz
linux-dev-d24d39d906fa8944024f154e0ea3f031252c06c1.zip
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 <yanjun.zhu@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/nvidia/forcedeth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index aa912f43e15f..994a83a1f0a5 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)