Merge branch 'topic/misc' into for-next

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 0fd256ceea6baec01ad6e1c7489d45e764006517..c4a4cdc07ab9de2a1c33384d18f4f55e8b8f28a6 100644 (file)
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -163,19 +163,10 @@ ld2(unsigned int x)
 static void
 au1550_delay(int msec)
 {
-       unsigned long   tmo;
-       signed long     tmo2;
-
        if (in_interrupt())
                return;
 
-       tmo = jiffies + (msec * HZ) / 1000;
-       for (;;) {
-               tmo2 = tmo - jiffies;
-               if (tmo2 <= 0)
-                       break;
-               schedule_timeout(tmo2);
-       }
+       schedule_timeout_uninterruptible(msecs_to_jiffies(msec));
 }
 
 static u16

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index e688dde6bbdeb0b54ae26c761eaba38b1ede5a95..52468742d9f240650376da69b368927c095041e7 100644 (file)
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -184,14 +184,8 @@ waveartist_iack(wavnc_info *devc)
 static inline int
 waveartist_sleep(int timeout_ms)
 {
-       unsigned int timeout = timeout_ms * 10 * HZ / 100;
-
-       do {
-               set_current_state(TASK_INTERRUPTIBLE);
-               timeout = schedule_timeout(timeout);
-       } while (timeout);
-
-       return 0;
+       unsigned int timeout = msecs_to_jiffies(timeout_ms*100);
+       return schedule_timeout_interruptible(timeout);
 }
 
 static int