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/dlink/sundance.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dlink/sundance.c 
b/drivers/net/ethernet/dlink/sundance.c
index 2704bcf..6ca9e98 100644
--- a/drivers/net/ethernet/dlink/sundance.c
+++ b/drivers/net/ethernet/dlink/sundance.c
@@ -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. */
-- 
2.7.4

Reply via email to