diff --git a/scst/include/backport.h b/scst/include/backport.h
index 526976022..0576e0226 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -708,7 +708,9 @@ struct t10_pi_tuple {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
 #undef DEFINE_TIMER
 #define DEFINE_TIMER(_name, _function)					\
-	struct timer_list _name = __TIMER_INITIALIZER(_function, 0, 0, 0)
+	struct timer_list _name = __TIMER_INITIALIZER(			\
+		(void (*)(unsigned long))(_function),			\
+		(unsigned long)&(_name), 0, 0)
 #endif
 
 /* <linux/types.h> */
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 284195d72..ff241e2b9 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -15368,7 +15368,7 @@ EXPORT_SYMBOL_GPL(scst_random);
 
 #define INIT_TM_DBG_STATE		TM_DBG_STATE_ABORT
 
-static void tm_dbg_timer_fn(unsigned long arg);
+static void tm_dbg_timer_fn(struct timer_list *timer);
 
 static DEFINE_SPINLOCK(scst_tm_dbg_lock);
 /* All serialized by scst_tm_dbg_lock */
@@ -15422,7 +15422,7 @@ static void tm_dbg_deinit_tgt_dev(struct scst_tgt_dev *tgt_dev)
 	return;
 }
 
-static void tm_dbg_timer_fn(unsigned long arg)
+static void tm_dbg_timer_fn(struct timer_list *timer)
 {
 	TRACE_MGMT_DBG("%s", "delayed cmd timer expired");
 	tm_dbg_flags.tm_dbg_release = 1;