diff mbox

[2/5] backports: backport from_timer() and timer_setup()

Message ID 20171011143147.3337-2-johannes@sipsolutions.net (mailing list archive)
State Accepted
Headers show

Commit Message

Johannes Berg Oct. 11, 2017, 2:31 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

These are needed for Kees's new timer API, and luckily
he already provided them for conversion purposes :-)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/backport-include/linux/timer.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
diff mbox

Patch

diff --git a/backport/backport-include/linux/timer.h b/backport/backport-include/linux/timer.h
index df560a26f77f..85f74d40deda 100644
--- a/backport/backport-include/linux/timer.h
+++ b/backport/backport-include/linux/timer.h
@@ -32,4 +32,20 @@  static inline void setup_deferrable_timer_key(struct timer_list *timer,
 
 #endif
 
+#ifndef from_timer
+#define TIMER_DATA_TYPE          unsigned long
+#define TIMER_FUNC_TYPE          void (*)(TIMER_DATA_TYPE)
+
+static inline void timer_setup(struct timer_list *timer,
+			       void (*callback) (struct timer_list *),
+			       unsigned int flags)
+{
+	__setup_timer(timer, (TIMER_FUNC_TYPE) callback,
+		      (TIMER_DATA_TYPE) timer, flags);
+}
+
+#define from_timer(var, callback_timer, timer_fieldname) \
+	container_of(callback_timer, typeof(*var), timer_fieldname)
+#endif
+
 #endif /* _BACKPORT_TIMER_H */