These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / atm / idt77105.c

diff --git a/kernel/drivers/atm/idt77105.c b/kernel/drivers/atm/idt77105.c
index 909c95b..feb023d 100644 (file)
--- a/kernel/drivers/atm/idt77105.c
+++ b/kernel/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);