microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[ALSA] Use msecs_to_jiffies() in ac97_codec.c 

Replace the direct calculation of jiffies with msecs_to_jiffies().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Takashi Iwai 2007-08-10 16:50:37 +02:00 коммит произвёл Jaroslav Kysela
Родитель 9b0d39be53
Коммит 45cffef1ff
1 изменённых файлов: 8 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
sound/pci/ac97/ac97_codec.c
Просмотреть файл

@ -2036,11 +2036,12 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
else { else {
udelay(50); udelay(50);
if (ac97->scaps & AC97_SCAP_SKIP_AUDIO) if (ac97->scaps & AC97_SCAP_SKIP_AUDIO)
err = ac97_reset_wait(ac97, HZ/2, 1); err = ac97_reset_wait(ac97, msecs_to_jiffies(500), 1);
else { else {
err = ac97_reset_wait(ac97, HZ/2, 0); err = ac97_reset_wait(ac97, msecs_to_jiffies(500), 0);
if (err < 0) if (err < 0)
err = ac97_reset_wait(ac97, HZ/2, 1); err = ac97_reset_wait(ac97,
msecs_to_jiffies(500), 1);
} }
if (err < 0) { if (err < 0) {
snd_printk(KERN_WARNING "AC'97 %d does not respond - RESET\n", ac97->num); snd_printk(KERN_WARNING "AC'97 %d does not respond - RESET\n", ac97->num);
@ -2104,7 +2105,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
} }
/* nothing should be in powerdown mode */ /* nothing should be in powerdown mode */
snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0); snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);
end_time = jiffies + (HZ / 10); end_time = jiffies + msecs_to_jiffies(100);
do { do {
if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f) if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)
goto __ready_ok; goto __ready_ok;
@ -2136,7 +2137,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
udelay(100); udelay(100);
/* nothing should be in powerdown mode */ /* nothing should be in powerdown mode */
snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0); snd_ac97_write_cache(ac97, AC97_EXTENDED_MSTATUS, 0);
end_time = jiffies + (HZ / 10); end_time = jiffies + msecs_to_jiffies(100);
do { do {
if ((snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS) & tmp) == tmp) if ((snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS) & tmp) == tmp)
goto __ready_ok; goto __ready_ok;
@ -2354,7 +2355,8 @@ int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)
* (for avoiding loud click noises for many (OSS) apps * (for avoiding loud click noises for many (OSS) apps
* that open/close frequently) * that open/close frequently)
*/ */
schedule_delayed_work(&ac97->power_work, HZ*2); schedule_delayed_work(&ac97->power_work,
msecs_to_jiffies(2000));
else { else {
cancel_delayed_work(&ac97->power_work); cancel_delayed_work(&ac97->power_work);
update_power_regs(ac97); update_power_regs(ac97);