[PATCH] hrtimer: fix multiple macro argument expansion

For two macros the arguments were expanded twice, change them to inline
functions to avoid it.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Roman Zippel and committed by Linus Torvalds b2ee9dbf 5f6164f3

+8 -2
+8 -2
include/linux/ktime.h
··· 96 96 ({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; }) 97 97 98 98 /* convert a timespec to ktime_t format: */ 99 - #define timespec_to_ktime(ts) ktime_set((ts).tv_sec, (ts).tv_nsec) 99 + static inline ktime_t timespec_to_ktime(struct timespec ts) 100 + { 101 + return ktime_set(ts.tv_sec, ts.tv_nsec); 102 + } 100 103 101 104 /* convert a timeval to ktime_t format: */ 102 - #define timeval_to_ktime(tv) ktime_set((tv).tv_sec, (tv).tv_usec * 1000) 105 + static inline ktime_t timeval_to_ktime(struct timeval tv) 106 + { 107 + return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC); 108 + } 103 109 104 110 /* Map the ktime_t to timespec conversion to ns_to_timespec function */ 105 111 #define ktime_to_timespec(kt) ns_to_timespec((kt).tv64)