]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drivers: net: sundance: use setup_timer() helper.
authorAllen Pais <allen.lkml@gmail.com>
Thu, 21 Sep 2017 17:04:36 +0000 (22:34 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Sep 2017 18:44:40 +0000 (11:44 -0700)
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>
drivers/net/ethernet/dlink/sundance.c

index 2704bcf023be771872b14ee71a04acbdea0446cf..6ca9e981ad57ebbc028db5408c9bfd394115352c 100644 (file)
@@ -913,10 +913,8 @@ static int netdev_open(struct net_device *dev)
                           ioread16(ioaddr + MACCtrl1), ioread16(ioaddr + MACCtrl0));
 
        /* Set the timer to check for link beat. */
-       init_timer(&np->timer);
+       setup_timer(&np->timer, netdev_timer, (unsigned long)dev);
        np->timer.expires = jiffies + 3*HZ;
-       np->timer.data = (unsigned long)dev;
-       np->timer.function = netdev_timer;                              /* timer handler */
        add_timer(&np->timer);
 
        /* Enable interrupts by setting the interrupt mask. */