From 0a4a5f96dd649a5c5e18d43d7bd206f35845e1cb Mon Sep 17 00:00:00 2001 From: Mike Nicholson Date: Tue, 6 Aug 2019 15:50:30 -0500 Subject: Add correct timer cb proto for kernel < 4.15.0 (cherry picked from commit 9cae1b197308e0ed093596c984bae21ded4e7ec8) --- io-module/mts-io.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/io-module/mts-io.c b/io-module/mts-io.c index 66ded86..154d120 100644 --- a/io-module/mts-io.c +++ b/io-module/mts-io.c @@ -135,9 +135,6 @@ static volatile int radio_reset_timer_is_start = 0; static struct timer_list radio_reset_available_timer; static volatile int radio_reset_available_timer_is_start = 0; static time_t time_now_secs(void); -static void radio_reset_available_timer_callback(struct timer_list *list); -static void radio_reset_timer_callback(struct timer_list *list); - /* generic GPIO support */ #include "gpio.c" @@ -283,7 +280,11 @@ static time_t time_now_secs(void) return ts.tv_sec; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) static void radio_reset_available_timer_callback( struct timer_list *data ) +#else +static void radio_reset_available_timer_callback( unsigned long data ) +#endif { /* do your timer stuff here */ //log_info("radio_reset_available_timer_callback\n"); @@ -295,7 +296,11 @@ static void radio_reset_available_timer_callback( struct timer_list *data ) radio_reset_available_timer_is_start = 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) static void radio_reset_timer_callback( struct timer_list *data ) +#else +static void radio_reset_timer_callback( unsigned long data ) +#endif { /* do your timer stuff here */ //log_info("radio_reset_timer_callback\n"); -- cgit v1.2.3