* [PATCH 1/1] driver/snd: es18xx driver should use udelay error
@ 2014-04-14 9:41 Li, Zhen-Hua
2014-04-14 9:46 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Li, Zhen-Hua @ 2014-04-14 9:41 UTC (permalink / raw)
To: Takashi Iwai, alsa-devel; +Cc: Li, Zhen-Hua
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/1] driver/snd: es18xx driver should use udelay error
@ 2014-04-14 9:43 Li, Zhen-Hua
2014-04-14 12:00 ` Clemens Ladisch
0 siblings, 1 reply; 6+ messages in thread
From: Li, Zhen-Hua @ 2014-04-14 9:43 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel; +Cc: Li, Zhen-Hua
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] driver/snd: es18xx driver should use udelay error
2014-04-14 9:41 Li, Zhen-Hua
@ 2014-04-14 9:46 ` Takashi Iwai
2014-04-14 10:10 ` Li, ZhenHua
0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2014-04-14 9:46 UTC (permalink / raw)
To: Li, Zhen-Hua; +Cc: alsa-devel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] driver/snd: es18xx driver should use udelay error
2014-04-14 9:46 ` Takashi Iwai
@ 2014-04-14 10:10 ` Li, ZhenHua
0 siblings, 0 replies; 6+ messages in thread
From: Li, ZhenHua @ 2014-04-14 10:10 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel
Hi Takashi,
Thanks for reviewing.
Zhenhua
On 04/14/2014 05:46 PM, Takashi Iwai wrote:
> 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
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] driver/snd: es18xx driver should use udelay error
2014-04-14 9:43 [PATCH 1/1] driver/snd: es18xx driver should use udelay error Li, Zhen-Hua
@ 2014-04-14 12:00 ` Clemens Ladisch
2014-04-14 12:30 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Clemens Ladisch @ 2014-04-14 12:00 UTC (permalink / raw)
To: Li, Zhen-Hua, Takashi Iwai; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel
Li, Zhen-Hua wrote:
> udelay with more than 20000 may cause __bad_udelay.
> Use mdelay for instead.
>
> #ifdef AVOID_POPS
> /* Avoid pops */
> - udelay(100000);
> + mudelay(100);
This will not compile. Please test with AVOID_POPS enabled.
Regards,
Clemens
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] driver/snd: es18xx driver should use udelay error
2014-04-14 12:00 ` Clemens Ladisch
@ 2014-04-14 12:30 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2014-04-14 12:30 UTC (permalink / raw)
To: Clemens Ladisch; +Cc: Li, Zhen-Hua, Jaroslav Kysela, alsa-devel, linux-kernel
At Mon, 14 Apr 2014 14:00:40 +0200,
Clemens Ladisch wrote:
>
> Li, Zhen-Hua wrote:
> > udelay with more than 20000 may cause __bad_udelay.
> > Use mdelay for instead.
> >
> > #ifdef AVOID_POPS
> > /* Avoid pops */
> > - udelay(100000);
> > + mudelay(100);
>
> This will not compile. Please test with AVOID_POPS enabled.
Oops, thanks for spotting. I fixed it now.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-04-14 12:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-14 9:43 [PATCH 1/1] driver/snd: es18xx driver should use udelay error Li, Zhen-Hua
2014-04-14 12:00 ` Clemens Ladisch
2014-04-14 12:30 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2014-04-14 9:41 Li, Zhen-Hua
2014-04-14 9:46 ` Takashi Iwai
2014-04-14 10:10 ` Li, ZhenHua
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox