aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/au1550_ac97.c
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-07-26 04:28:32 -0400
committerTakashi Iwai <tiwai@suse.de>2010-07-26 04:33:31 -0400
commit2232e238295d8ea707fe4271ffbfd4f32346aa81 (patch)
treeb6188ead47b4c996a6e0ff48b07034276ede8941 /sound/oss/au1550_ac97.c
parentff388f270d926d95d70e5b3d373c9cb97b38c8b1 (diff)
sound: 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 <segooon@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/au1550_ac97.c')
-rw-r--r--sound/oss/au1550_ac97.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 0fd256ceea6b..c4a4cdc07ab9 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -163,19 +163,10 @@ ld2(unsigned int x)
163static void 163static void
164au1550_delay(int msec) 164au1550_delay(int msec)
165{ 165{
166 unsigned long tmo;
167 signed long tmo2;
168
169 if (in_interrupt()) 166 if (in_interrupt())
170 return; 167 return;
171 168
172 tmo = jiffies + (msec * HZ) / 1000; 169 schedule_timeout_uninterruptible(msecs_to_jiffies(msec));
173 for (;;) {
174 tmo2 = tmo - jiffies;
175 if (tmo2 <= 0)
176 break;
177 schedule_timeout(tmo2);
178 }
179} 170}
180 171
181static u16 172static u16