From 9991c959ef14a8db47fab9ee0c7fa55316c055cf Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Thu, 10 Jan 2019 03:55:26 +0000 Subject: [PATCH] dahdi_dummy: Fix timer_setup API usage. It looked like the recent change to add support for timer_setup was not completely implemented / tested with dahdi_dummy. I was using it to check some changes to the timekeeping API when I noticed this. This does not really affect anyone since, by default, dahdi_dummy is no longer built and even if it was built, it would not use the standard timer interface by default on newer kernels. Signed-off-by: Shaun Ruffell --- drivers/dahdi/dahdi_dummy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index 61e2c4f..03a2991 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -156,7 +156,7 @@ static unsigned long timespec_diff_ms(struct timespec *t0, struct timespec *t1) return ms; } -static void dahdi_dummy_timer(struct timer_timer *unused) +static void dahdi_dummy_timer(TIMER_DATA_TYPE unused) { unsigned long ms_since_start; struct timespec now; @@ -257,7 +257,7 @@ int init_module(void) hrtimer_start(&zaptimer, ktime_set(0, DAHDI_TIME_NS), HRTIMER_MODE_REL); printk(KERN_INFO "dahdi_dummy: High Resolution Timer started, good to go\n"); #else - timer_setup(&timer, dahdi_dummy_timer); + timer_setup(&timer, dahdi_dummy_timer, 0); ztd->start_interval = current_kernel_time(); atomic_set(&shutdown, 0); mod_timer(&timer, jiffies + JIFFIES_INTERVAL);