From: 黄涛 Date: Sat, 30 Jul 2011 07:54:41 +0000 (+0800) Subject: Revert "timer: Added usleep_range timer" X-Git-Tag: firefly_0821_release~10040 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f2bbceb464219b187fbb1e954c046157e223cd6;p=firefly-linux-kernel-4.4.55.git Revert "timer: Added usleep_range timer" This reverts commit 18464b0b7575266595c3a1b8e0aab9198033b85e. --- diff --git a/include/linux/delay.h b/include/linux/delay.h index a6ecb34cf547..fd832c6d419e 100644 --- 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 0015407e18b1..cb3c1f19a2f6 100644 --- 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);