Merge tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / drivers / atm / idt77105.c

diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 909c95bd7be260ec970dc42f1299113333793b4e..feb023d7eebd60615fe762a73e2dc703293a6306 100644 (file)
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -306,14 +306,12 @@ static int idt77105_start(struct atm_dev *dev)
        if (start_timer) {
                start_timer = 0;
                 
-               init_timer(&stats_timer);
+               setup_timer(&stats_timer, idt77105_stats_timer_func, 0UL);
                stats_timer.expires = jiffies+IDT77105_STATS_TIMER_PERIOD;
-               stats_timer.function = idt77105_stats_timer_func;
                add_timer(&stats_timer);
                 
-               init_timer(&restart_timer);
+               setup_timer(&restart_timer, idt77105_restart_timer_func, 0UL);
                restart_timer.expires = jiffies+IDT77105_RESTART_TIMER_PERIOD;
-               restart_timer.function = idt77105_restart_timer_func;
                add_timer(&restart_timer);
        }
        spin_unlock_irqrestore(&idt77105_priv_lock, flags);