[PATCH] radio/radio-sf16fmr2: replace schedule_timeout() with msleep()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index aa49c8e5c442500d7ebc82a9f7cfe32f7ab0ee1d..7e980d15f317a2c88cce01ce1617941da0b751b6 100644 (file)
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -55,19 +55,6 @@ static int radio_nr = -1;
 #define RSF16_MINFREQ 87*16000
 #define RSF16_MAXFREQ 108*16000
 
-/* from radio-aimslab */
-static void sleep_delay(unsigned long n)
-{
-       unsigned d=n/(1000000U/HZ);
-       if (!d)
-               udelay(n);
-       else
-       {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(d);
-       }
-}
-
 static inline void wait(int n,int port)
 {
        for (;n;--n) inb(port);
@@ -153,7 +140,7 @@ static int fmr2_setfreq(struct fmr2_device *dev)
        fmr2_unmute(port);
 
        /* wait 0.11 sec */
-       sleep_delay(110000LU);
+       msleep(110);
 
        /* NOTE if mute this stop radio
           you must set freq on unmute */