]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
sound: oss: au1550_ac97: simplify au1550_delay()
authorKulikov Vasiliy <segooon@gmail.com>
Mon, 26 Jul 2010 08:28:32 +0000 (12:28 +0400)
committerTakashi Iwai <tiwai@suse.de>
Mon, 26 Jul 2010 08:33:31 +0000 (10:33 +0200)
au1550_delay() uses loop with schedule_timeout() to unconditionally wait
for msec. Use schedule_timeout_uninteruptible() instead.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/oss/au1550_ac97.c

index 0fd256ceea6baec01ad6e1c7489d45e764006517..c4a4cdc07ab9de2a1c33384d18f4f55e8b8f28a6 100644 (file)
@@ -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