Use setup_timer function instead of initializing timer with the
    function and data fields.

Signed-off-by: Allen Pais <allen.l...@gmail.com>
---
 drivers/net/ethernet/natsemi/ns83820.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/ns83820.c 
b/drivers/net/ethernet/natsemi/ns83820.c
index 729095d..99d3c78 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -1652,9 +1652,7 @@ static int ns83820_open(struct net_device *ndev)
        writel(0, dev->base + TXDP_HI);
        writel(desc, dev->base + TXDP);
 
-       init_timer(&dev->tx_watchdog);
-       dev->tx_watchdog.data = (unsigned long)ndev;
-       dev->tx_watchdog.function = ns83820_tx_watch;
+       setup_timer(&dev->tx_watchdog, ns83820_tx_watch, (unsigned long)ndev);
        mod_timer(&dev->tx_watchdog, jiffies + 2*HZ);
 
        netif_start_queue(ndev);        /* FIXME: wait for phy to come up */
-- 
2.7.4

Reply via email to