Commit 272705c5 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

[PATCH] hrtimers: remove DEFINE_KTIME and ktime_to_clock_t()

Now that it_real_value is gone, the last user of DEFINE_KTIME and
ktime_to_clock_t are also gone, so remove it before someone starts using it
again.
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4dee26b7
...@@ -64,9 +64,6 @@ typedef union { ...@@ -64,9 +64,6 @@ typedef union {
#if (BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR) #if (BITS_PER_LONG == 64) || defined(CONFIG_KTIME_SCALAR)
/* Define a ktime_t variable and initialize it to zero: */
#define DEFINE_KTIME(kt) ktime_t kt = { .tv64 = 0 }
/** /**
* ktime_set - Set a ktime_t variable from a seconds/nanoseconds value * ktime_set - Set a ktime_t variable from a seconds/nanoseconds value
* *
...@@ -113,9 +110,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv) ...@@ -113,9 +110,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv)
/* Map the ktime_t to timeval conversion to ns_to_timeval function */ /* Map the ktime_t to timeval conversion to ns_to_timeval function */
#define ktime_to_timeval(kt) ns_to_timeval((kt).tv64) #define ktime_to_timeval(kt) ns_to_timeval((kt).tv64)
/* Map the ktime_t to clock_t conversion to the inline in jiffies.h: */
#define ktime_to_clock_t(kt) nsec_to_clock_t((kt).tv64)
/* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */ /* Convert ktime_t to nanoseconds - NOP in the scalar storage format: */
#define ktime_to_ns(kt) ((kt).tv64) #define ktime_to_ns(kt) ((kt).tv64)
...@@ -136,9 +130,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv) ...@@ -136,9 +130,6 @@ static inline ktime_t timeval_to_ktime(struct timeval tv)
* tv.sec < 0 and 0 >= tv.nsec < NSEC_PER_SEC * tv.sec < 0 and 0 >= tv.nsec < NSEC_PER_SEC
*/ */
/* Define a ktime_t variable and initialize it to zero: */
#define DEFINE_KTIME(kt) ktime_t kt = { .tv64 = 0 }
/* Set a ktime_t variable to a value in sec/nsec representation: */ /* Set a ktime_t variable to a value in sec/nsec representation: */
static inline ktime_t ktime_set(const long secs, const unsigned long nsecs) static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
{ {
...@@ -254,17 +245,6 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt) ...@@ -254,17 +245,6 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
.tv_usec = (suseconds_t) (kt.tv.nsec / NSEC_PER_USEC) }; .tv_usec = (suseconds_t) (kt.tv.nsec / NSEC_PER_USEC) };
} }
/**
* ktime_to_clock_t - convert a ktime_t variable to clock_t format
* @kt: the ktime_t variable to convert
*
* Returns a clock_t variable with the converted value
*/
static inline clock_t ktime_to_clock_t(const ktime_t kt)
{
return nsec_to_clock_t( (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec);
}
/** /**
* ktime_to_ns - convert a ktime_t variable to scalar nanoseconds * ktime_to_ns - convert a ktime_t variable to scalar nanoseconds
* @kt: the ktime_t variable to convert * @kt: the ktime_t variable to convert
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment