drivers: net: et131x: use setup_timer() helper.

[linux-2.6-microblaze.git] / drivers / net / ethernet / agere / et131x.c

diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 54eff90..658e92f 100644 (file)
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3624,11 +3624,10 @@ static int et131x_open(struct net_device *netdev)
        int result;
 
        /* Start the timer to track NIC errors */
-       init_timer(&adapter->error_timer);
+       setup_timer(&adapter->error_timer, et131x_error_timer_handler,
+                   (unsigned long)adapter);
        adapter->error_timer.expires = jiffies +
                msecs_to_jiffies(TX_ERROR_PERIOD);
-       adapter->error_timer.function = et131x_error_timer_handler;
-       adapter->error_timer.data = (unsigned long)adapter;
        add_timer(&adapter->error_timer);
 
        result = request_irq(irq, et131x_isr,