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

diff --git a/drivers/net/ethernet/packetengines/hamachi.c 
b/drivers/net/ethernet/packetengines/hamachi.c
index 482b85e..77bc7cc 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -979,10 +979,8 @@ static int hamachi_open(struct net_device *dev)
                           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;
-- 
2.7.4

Reply via email to