drivers: net: winbond-840: 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>

diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 32d7229544faeb13fde6a887ced18f1f58b4aeab..6f88d687b6d28ff053a7a17a5b2a5c27e608a1b7 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -655,10 +655,8 @@ static int netdev_open(struct net_device *dev)
                netdev_dbg(dev, "Done netdev_open()\n");
 
        /* 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 + 1*HZ;
-       np->timer.data = (unsigned long)dev;
-       np->timer.function = netdev_timer;                              /* timer handler */
        add_timer(&np->timer);
        return 0;
 out_err: