diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 10:37:40 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:16:59 +0100 |
| commit | 954bea35571461b083390a82b03f077f901fe678 (patch) | |
| tree | 5fb17a9692886a133a943e1961af81a32df4886f /sound/pci/intel8x0m.c | |
| parent | c9a49bb1957f45e0146c17a865f1444fd06c0f97 (diff) | |
| download | kernel_samsung_aries-954bea35571461b083390a82b03f077f901fe678.zip kernel_samsung_aries-954bea35571461b083390a82b03f077f901fe678.tar.gz kernel_samsung_aries-954bea35571461b083390a82b03f077f901fe678.tar.bz2 | |
[ALSA] intel8x0 - Clean up delay function
Modules: Intel8x0 driver,Intel8x0-modem driver
Remove superfluous delay macro.
Call appropriate functions directly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/intel8x0m.c')
| -rw-r--r-- | sound/pci/intel8x0m.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index a420918..3244df9 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -889,10 +889,6 @@ static int __devinit snd_intel8x0_mixer(intel8x0_t *chip, int ac97_clock) * */ -#define do_delay(chip) do {\ - schedule_timeout_uninterruptible(1);\ -} while (0) - static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) { unsigned long end_time; @@ -914,7 +910,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) do { if ((igetdword(chip, ICHREG(GLOB_CNT)) & ICH_AC97WARM) == 0) goto __ok; - do_delay(chip); + schedule_timeout_uninterruptible(1); } while (time_after_eq(end_time, jiffies)); snd_printk(KERN_ERR "AC'97 warm reset still in progress? [0x%x]\n", igetdword(chip, ICHREG(GLOB_CNT))); return -EIO; @@ -930,7 +926,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) status = igetdword(chip, ICHREG(GLOB_STA)) & (ICH_PCR | ICH_SCR | ICH_TCR); if (status) break; - do_delay(chip); + schedule_timeout_uninterruptible(1); } while (time_after_eq(end_time, jiffies)); if (! status) { /* no codec is found */ @@ -944,7 +940,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) /* wait for other codecs ready status. */ end_time = jiffies + HZ / 4; while (status != nstatus && time_after_eq(end_time, jiffies)) { - do_delay(chip); + schedule_timeout_uninterruptible(1); status |= igetdword(chip, ICHREG(GLOB_STA)) & nstatus; } @@ -959,7 +955,7 @@ static int snd_intel8x0m_ich_chip_init(intel8x0_t *chip, int probing) nstatus = igetdword(chip, ICHREG(GLOB_STA)) & (ICH_PCR | ICH_SCR | ICH_TCR); if (status == nstatus) break; - do_delay(chip); + schedule_timeout_uninterruptible(1); } while (time_after_eq(end_time, jiffies)); } |