Revert "timer: Added usleep_range timer"

This reverts commit 18464b0b7575266595c3a1b8e0aab9198033b85e.

diff --git a/include/linux/delay.h b/include/linux/delay.h
index a6ecb34cf547da29ad16edf8b109de2511d10cd5..fd832c6d419efc377a698eecd146032d5f68a8d1 100644 (file)
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -45,7 +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 ssleep(unsigned int seconds)
 {

diff --git a/kernel/timer.c b/kernel/timer.c
index 0015407e18b16c1254bedb07b795b985a45f9820..cb3c1f19a2f6f001952cca2cb32cc69c45298820 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1690,25 +1690,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) * NSEC_PER_USEC;
-       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);