diff options
| author | John Klug <john.klug@multitech.com> | 2019-07-24 16:44:35 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2020-10-16 10:16:50 -0500 |
| commit | 8076900614eb76e42524abebb8333028bfe22810 (patch) | |
| tree | 5178f82fe62dc6c5073acfb8ae325e2fcf712489 | |
| parent | 9271e594de3eaeacd89ccf983a5a62d8ce22acfa (diff) | |
| download | mts-io-8076900614eb76e42524abebb8333028bfe22810.tar.gz mts-io-8076900614eb76e42524abebb8333028bfe22810.tar.bz2 mts-io-8076900614eb76e42524abebb8333028bfe22810.zip | |
New 4.19 kernel replaced setup_timer with timer_setup
(cherry picked from commit a0c2b0390d8a92d89fcda252f9e09275446d01dd)
| -rw-r--r-- | io-module/mts-io.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/io-module/mts-io.c b/io-module/mts-io.c index a84a427..afa2492 100644 --- a/io-module/mts-io.c +++ b/io-module/mts-io.c @@ -132,8 +132,8 @@ 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(unsigned long data); -static void radio_reset_timer_callback(unsigned long data); +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" @@ -280,7 +280,7 @@ static time_t time_now_secs(void) return ts.tv_sec; } -static void radio_reset_available_timer_callback( unsigned long data ) +static void radio_reset_available_timer_callback( struct timer_list *data ) { /* do your timer stuff here */ //log_info("radio_reset_available_timer_callback\n"); @@ -292,7 +292,7 @@ static void radio_reset_available_timer_callback( unsigned long data ) radio_reset_available_timer_is_start = 0; } -static void radio_reset_timer_callback( unsigned long data ) +static void radio_reset_timer_callback( struct timer_list *data ) { /* do your timer stuff here */ //log_info("radio_reset_timer_callback\n"); @@ -1021,9 +1021,13 @@ static int __init mts_io_init(void) init_buttons(); /* init timers */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) + timer_setup(&radio_reset_timer, radio_reset_timer_callback, 0); + timer_setup(&radio_reset_available_timer, radio_reset_available_timer_callback, 0); +#else setup_timer(&radio_reset_timer, radio_reset_timer_callback, 0); setup_timer(&radio_reset_available_timer, radio_reset_available_timer_callback, 0); - +#endif return 0; } |