Эх сурвалжийг харах

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>
Allen Pais 7 жил өмнө
parent
commit
e998092f7b

+ 5 - 7
drivers/net/ethernet/toshiba/spider_net.c

@@ -2256,16 +2256,14 @@ spider_net_setup_netdev(struct spider_net_card *card)
 
 
 	pci_set_drvdata(card->pdev, netdev);
 	pci_set_drvdata(card->pdev, netdev);
 
 
-	init_timer(&card->tx_timer);
-	card->tx_timer.function =
-		(void (*)(unsigned long)) spider_net_cleanup_tx_ring;
-	card->tx_timer.data = (unsigned long) card;
+	setup_timer(&card->tx_timer,
+		    (void(*)(unsigned long))spider_net_cleanup_tx_ring,
+		    (unsigned long)card);
 	netdev->irq = card->pdev->irq;
 	netdev->irq = card->pdev->irq;
 
 
 	card->aneg_count = 0;
 	card->aneg_count = 0;
-	init_timer(&card->aneg_timer);
-	card->aneg_timer.function = spider_net_link_phy;
-	card->aneg_timer.data = (unsigned long) card;
+	setup_timer(&card->aneg_timer, spider_net_link_phy,
+		    (unsigned long)card);
 
 
 	netif_napi_add(netdev, &card->napi,
 	netif_napi_add(netdev, &card->napi,
 		       spider_net_poll, SPIDER_NET_NAPI_WEIGHT);
 		       spider_net_poll, SPIDER_NET_NAPI_WEIGHT);