From: Takashi Iwai <tiwai@suse.de>
To: "Li, Zhen-Hua" <zhen-hual@hp.com>
Cc: alsa-devel@alsa-project.org
Subject: Re: [PATCH 1/1] driver/snd: es18xx driver should use udelay error
Date: Mon, 14 Apr 2014 11:46:59 +0200 [thread overview]
Message-ID: <s5hioqcmeek.wl%tiwai@suse.de> (raw)
In-Reply-To: <1397468492-18514-1-git-send-email-zhen-hual@hp.com>
At Mon, 14 Apr 2014 17:41:32 +0800,
Li, Zhen-Hua wrote:
>
> From: "Li, Zhen-Hua" <zhen-hual@hp.com>
>
> udelay with more than 20000 may cause __bad_udelay.
> Use mdelay for instead.
>
> Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
Thanks, applied.
Takashi
> ---
> sound/isa/es18xx.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
> index 1c16830..8d3a3b6 100644
> --- a/sound/isa/es18xx.c
> +++ b/sound/isa/es18xx.c
> @@ -520,7 +520,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
> snd_es18xx_mixer_write(chip, 0x78, 0x93);
> #ifdef AVOID_POPS
> /* Avoid pops */
> - udelay(100000);
> + mudelay(100);
> if (chip->caps & ES18XX_PCM2)
> /* Restore Audio 2 volume */
> snd_es18xx_mixer_write(chip, 0x7C, chip->audio2_vol);
> @@ -537,7 +537,7 @@ static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
> /* Stop DMA */
> snd_es18xx_mixer_write(chip, 0x78, 0x00);
> #ifdef AVOID_POPS
> - udelay(25000);
> + mdelay(25);
> if (chip->caps & ES18XX_PCM2)
> /* Set Audio 2 volume to 0 */
> snd_es18xx_mixer_write(chip, 0x7C, 0);
> @@ -596,7 +596,7 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
> snd_es18xx_write(chip, 0xA5, count >> 8);
>
> #ifdef AVOID_POPS
> - udelay(100000);
> + mdelay(100);
> #endif
>
> /* Set format */
> @@ -691,7 +691,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
> snd_es18xx_write(chip, 0xB8, 0x05);
> #ifdef AVOID_POPS
> /* Avoid pops */
> - udelay(100000);
> + mdelay(100);
> /* Enable Audio 1 */
> snd_es18xx_dsp_command(chip, 0xD1);
> #endif
> @@ -705,7 +705,7 @@ static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
> snd_es18xx_write(chip, 0xB8, 0x00);
> #ifdef AVOID_POPS
> /* Avoid pops */
> - udelay(25000);
> + mdelay(25);
> /* Disable Audio 1 */
> snd_es18xx_dsp_command(chip, 0xD3);
> #endif
> --
> 1.7.10.4
>
next prev parent reply other threads:[~2014-04-14 9:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 9:41 [PATCH 1/1] driver/snd: es18xx driver should use udelay error Li, Zhen-Hua
2014-04-14 9:46 ` Takashi Iwai [this message]
2014-04-14 10:10 ` Li, ZhenHua
-- strict thread matches above, loose matches on Subject: below --
2014-04-14 9:43 Li, Zhen-Hua
2014-04-14 12:00 ` Clemens Ladisch
2014-04-14 12:30 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hioqcmeek.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=zhen-hual@hp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox