Skip to contentSkip to conversation

oss: au1550_ac97: simplify au1550_delay()

PATCH Applied Kulikov Vasiliy 2 participants 2 messages Jul 26, 2010

Subsystems (2)
Sound Kernel janitors
lore
Share & tools
lore

Kulikov Vasiliy

author
#0 lore raw

PATCH 1/1 oss: au1550_ac97: simplify au1550_delay()

au1550_delay() uses loop with schedule_timeout() to unconditionally wait for msec. Use schedule_timeout_uninteruptible() instead.

Signed-off-by Kulikov Vasiliy <[email protected]>
---
 sound/oss/au1550_ac97.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
sound/oss/au1550_ac97.c +1 -10
index 0fd256c..c4a4cdc 100644
@@ -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
Signature · 1 line
1.7.0.4
Applied
#1 lore raw

At Mon, 26 Jul 2010 12:28:32 +0400,

Quoted 5 lines · Kulikov Vasiliy

au1550_delay() uses loop with schedule_timeout() to unconditionally wait for msec. Use schedule_timeout_uninteruptible() instead.

Signed-off-by Kulikov Vasiliy <[email protected]>

Thanks, applied both patches.

Takashi

Quoted 32 lines
---
 sound/oss/au1550_ac97.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)
sound/oss/au1550_ac97.c +1 -10
index 0fd256c..c4a4cdc 100644
@@ -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
Signature · 1 line
1.7.0.4