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/dec/tulip/de4x5.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c 
b/drivers/net/ethernet/dec/tulip/de4x5.c
index 0affee9..299812e 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1147,9 +1147,8 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, 
struct device *gendev)
        lp->timeout = -1;
        lp->gendev = gendev;
        spin_lock_init(&lp->lock);
-       init_timer(&lp->timer);
-       lp->timer.function = (void (*)(unsigned long))de4x5_ast;
-       lp->timer.data = (unsigned long)dev;
+       setup_timer(&lp->timer, (void (*)(unsigned long))de4x5_ast,
+                   (unsigned long)dev);
        de4x5_parse_params(dev);
 
        /*
-- 
2.7.4

Reply via email to