2010-07-26 08:29:24

by Kulikov Vasiliy

Subject: [PATCH] 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(-)

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 0fd256c..c4a4cdc 100644
--- 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
--
1.7.0.4

2010-07-26 08:35:26

by Takashi Iwai

Subject: Re: [PATCH] oss: au1550_ac97: simplify au1550_delay()

At Mon, 26 Jul 2010 12:28:32 +0400,
Kulikov Vasiliy wrote:
>
> 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

> ---
> sound/oss/au1550_ac97.c | 11 +----------
> 1 files changed, 1 insertions(+), 10 deletions(-)
>
> diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
> index 0fd256c..c4a4cdc 100644
> --- 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
> --
> 1.7.0.4
>