aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAllen Pais <allen.lkml@gmail.com>2017-09-21 13:04:41 -0400
committerDavid S. Miller <davem@davemloft.net>2017-09-21 14:44:40 -0400
commite998092f7b7c2ce3199db91177aa43397a3f76d7 (patch)
tree5fbf77c8816f282dfbf106f18fb2c02d6ebd602c /drivers
parent18df06c2cafea69b19ab5f274865b89c3ab0f715 (diff)
drivers: net: spider_net: use setup_timer() helper.
Use setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: Allen Pais <allen.lkml@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/toshiba/spider_net.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/toshiba/spider_net.c b/drivers/net/ethernet/toshiba/spider_net.c
index cec9e70ab995..a913538d3213 100644
--- a/drivers/net/ethernet/toshiba/spider_net.c
+++ b/drivers/net/ethernet/toshiba/spider_net.c
@@ -2256,16 +2256,14 @@ spider_net_setup_netdev(struct spider_net_card *card)
2256 2256
2257 pci_set_drvdata(card->pdev, netdev); 2257 pci_set_drvdata(card->pdev, netdev);
2258 2258
2259 init_timer(&card->tx_timer); 2259 setup_timer(&card->tx_timer,
2260 card->tx_timer.function = 2260 (void(*)(unsigned long))spider_net_cleanup_tx_ring,
2261 (void (*)(unsigned long)) spider_net_cleanup_tx_ring; 2261 (unsigned long)card);
2262 card->tx_timer.data = (unsigned long) card;
2263 netdev->irq = card->pdev->irq; 2262 netdev->irq = card->pdev->irq;
2264 2263
2265 card->aneg_count = 0; 2264 card->aneg_count = 0;
2266 init_timer(&card->aneg_timer); 2265 setup_timer(&card->aneg_timer, spider_net_link_phy,
2267 card->aneg_timer.function = spider_net_link_phy; 2266 (unsigned long)card);
2268 card->aneg_timer.data = (unsigned long) card;
2269 2267
2270 netif_napi_add(netdev, &card->napi, 2268 netif_napi_add(netdev, &card->napi,
2271 spider_net_poll, SPIDER_NET_NAPI_WEIGHT); 2269 spider_net_poll, SPIDER_NET_NAPI_WEIGHT);