torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ALSA: ali5451: use mdelay instead of large udelay constants

Browse Source 
ARM cannot handle udelay for more than 2 miliseconds, so we
should use mdelay instead for those.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Arnd Bergmann 2013-04-25 19:28:49 +02:00 committed by Takashi Iwai
parent 2fc565e4ea
commit 7603935838
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/ali5451/ali5451.c
View File

@ -451,10 +451,10 @@ static int snd_ali_reset_5451(struct snd_ali *codec)
if (pci_dev) { if (pci_dev) {
pci_read_config_dword(pci_dev, 0x7c, &dwVal); pci_read_config_dword(pci_dev, 0x7c, &dwVal);
pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000); pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000);
udelay(5000); mdelay(5);
pci_read_config_dword(pci_dev, 0x7c, &dwVal); pci_read_config_dword(pci_dev, 0x7c, &dwVal);
pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff); pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff);
udelay(5000); mdelay(5);
} }
pci_dev = codec->pci; pci_dev = codec->pci;
@ -463,14 +463,14 @@ static int snd_ali_reset_5451(struct snd_ali *codec)
udelay(500); udelay(500);
pci_read_config_dword(pci_dev, 0x44, &dwVal); pci_read_config_dword(pci_dev, 0x44, &dwVal);
pci_write_config_dword(pci_dev, 0x44, dwVal & 0xfffbffff); pci_write_config_dword(pci_dev, 0x44, dwVal & 0xfffbffff);
udelay(5000); mdelay(5);
wCount = 200; wCount = 200;
while(wCount--) { while(wCount--) {
wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN); wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN);
if ((wReg & 0x000f) == 0x000f) if ((wReg & 0x000f) == 0x000f)
return 0; return 0;
udelay(5000); mdelay(5);
} }
/* non-fatal if you have a non PM capable codec */ /* non-fatal if you have a non PM capable codec */