diff options
| author | Takashi Iwai | 2005-11-17 10:35:53 +0100 |
|---|---|---|
| committer | Jaroslav Kysela | 2006-01-03 12:16:54 +0100 |
| commit | bfdcbace6c76cab54f1651349816dc35cc8f12b8 (patch) | |
| tree | a47854af645cc38f0a53154c313d8691c2d4fe4a /sound/pci | |
| parent | 03f9ae2505cf2f5d56c197b4045ed9dba5ce8912 (diff) | |
[ALSA] Remove superfluous macros
Modules: ATIIXP driver,ATIIXP-modem driver
Remove superfluous macros for delay.
Call appropriate functions directly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/atiixp.c | 12 | ||||
| -rw-r--r-- | sound/pci/atiixp_modem.c | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 8bae10d93529..36395d0f3d87 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -328,12 +328,6 @@ static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg, #define atiixp_update(chip,reg,mask,val) \ snd_atiixp_update_bits(chip, ATI_REG_##reg, mask, val) -/* delay for one tick */ -#define do_delay() do { \ - schedule_timeout_uninterruptible(1); \ -} while (0) - - /* * handling DMA packets * @@ -513,7 +507,7 @@ static int snd_atiixp_aclink_reset(atiixp_t *chip) atiixp_update(chip, CMD, ATI_REG_CMD_AC_SYNC|ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_SYNC); atiixp_read(chip, CMD); - do_delay(); + msleep(1); atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); if (--timeout) { snd_printk(KERN_ERR "atiixp: codec reset timeout\n"); @@ -561,9 +555,9 @@ static int snd_atiixp_codec_detect(atiixp_t *chip) chip->codec_not_ready_bits = 0; atiixp_write(chip, IER, CODEC_CHECK_BITS); /* wait for the interrupts */ - timeout = HZ / 10; + timeout = 50; while (timeout-- > 0) { - do_delay(); + msleep(1); if (chip->codec_not_ready_bits) break; } diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 3174b6625419..649a999214e2 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c @@ -305,12 +305,6 @@ static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg, #define atiixp_update(chip,reg,mask,val) \ snd_atiixp_update_bits(chip, ATI_REG_##reg, mask, val) -/* delay for one tick */ -#define do_delay() do { \ - schedule_timeout_uninterruptible(1); \ -} while (0) - - /* * handling DMA packets * @@ -495,7 +489,7 @@ static int snd_atiixp_aclink_reset(atiixp_t *chip) atiixp_update(chip, CMD, ATI_REG_CMD_AC_SYNC|ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_SYNC); atiixp_read(chip, CMD); - do_delay(); + msleep(1); atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); if (--timeout) { snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n"); @@ -543,9 +537,9 @@ static int snd_atiixp_codec_detect(atiixp_t *chip) chip->codec_not_ready_bits = 0; atiixp_write(chip, IER, CODEC_CHECK_BITS); /* wait for the interrupts */ - timeout = HZ / 10; + timeout = 50; while (timeout-- > 0) { - do_delay(); + msleep(1); if (chip->codec_not_ready_bits) break; } |