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

diff --git a/drivers/net/ethernet/amd/sunlance.c 
b/drivers/net/ethernet/amd/sunlance.c
index 291ca51..0183ffb 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1459,9 +1459,8 @@ static int sparc_lance_probe_one(struct platform_device 
*op,
         * can occur from interrupts (ex. IPv6).  So we
         * use a timer to try again later when necessary. -DaveM
         */
-       init_timer(&lp->multicast_timer);
-       lp->multicast_timer.data = (unsigned long) dev;
-       lp->multicast_timer.function = lance_set_multicast_retry;
+       setup_timer(&lp->multicast_timer, lance_set_multicast_retry,
+                   (unsigned long)dev);
 
        if (register_netdev(dev)) {
                printk(KERN_ERR "SunLance: Cannot register device.\n");
-- 
2.7.4

Reply via email to