Revert "timer: Added usleep[_range] timer"

This reverts commit 22b8f15c2f7130bb0386f548428df2ffd4e81903 to merge
an advanced version.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/delay.h b/include/linux/delay.h
index 0e303d1aacd8b3fcb40407ca8765c6d2cde3aa0d..fd832c6d419efc377a698eecd146032d5f68a8d1 100644 (file)
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -45,12 +45,6 @@ extern unsigned long lpj_fine;
 void calibrate_delay(void);
 void msleep(unsigned int msecs);
 unsigned long msleep_interruptible(unsigned int msecs);
-void usleep_range(unsigned long min, unsigned long max);
-
-static inline void usleep(unsigned long usecs)
-{
-       usleep_range(usecs, usecs);
-}
 
 static inline void ssleep(unsigned int seconds)
 {

diff --git a/kernel/timer.c b/kernel/timer.c
index f110f241ab66ffcaec4d50f7fc28c27720d67789..ce98685cd1cb449adc31b12c694ac7bd755e1abc 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1755,25 +1755,3 @@ unsigned long msleep_interruptible(unsigned int msecs)
 }
 
 EXPORT_SYMBOL(msleep_interruptible);
-
-static int __sched do_usleep_range(unsigned long min, unsigned long max)
-{
-       ktime_t kmin;
-       unsigned long delta;
-
-       kmin = ktime_set(0, min * NSEC_PER_USEC);
-       delta = max - min;
-       return schedule_hrtimeout_range(&kmin, delta, HRTIMER_MODE_REL);
-}
-
-/**
- * usleep_range - Drop in replacement for udelay where wakeup is flexible
- * @min: Minimum time in usecs to sleep
- * @max: Maximum time in usecs to sleep
- */
-void usleep_range(unsigned long min, unsigned long max)
-{
-       __set_current_state(TASK_UNINTERRUPTIBLE);
-       do_usleep_range(min, max);
-}
-EXPORT_SYMBOL(usleep_range);