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>
                           dev->name, readw(ioaddr + RxStatus), readw(ioaddr + TxStatus));
        }
        /* Set the timer to check for link beat. */
-       init_timer(&hmp->timer);
+       setup_timer(&hmp->timer, hamachi_timer, (unsigned long)dev);
        hmp->timer.expires = RUN_AT((24*HZ)/10);                        /* 2.4 sec. */
-       hmp->timer.data = (unsigned long)dev;
-       hmp->timer.function = hamachi_timer;                            /* timer handler */
        add_timer(&hmp->timer);
 
        return 0;