From 635c5366fb79d4b6087e3b29960d39b43c9bada3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Nov 2005 10:35:53 +0100 Subject: [PATCH] --- yaml --- r: 15938 b: refs/heads/master c: bfdcbace6c76cab54f1651349816dc35cc8f12b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/atiixp.c | 12 +++--------- trunk/sound/pci/atiixp_modem.c | 12 +++--------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 1dc96898bee3..c8ead6244da3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03f9ae2505cf2f5d56c197b4045ed9dba5ce8912 +refs/heads/master: bfdcbace6c76cab54f1651349816dc35cc8f12b8 diff --git a/trunk/sound/pci/atiixp.c b/trunk/sound/pci/atiixp.c index 8bae10d93529..36395d0f3d87 100644 --- a/trunk/sound/pci/atiixp.c +++ b/trunk/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/trunk/sound/pci/atiixp_modem.c b/trunk/sound/pci/atiixp_modem.c index 3174b6625419..649a999214e2 100644 --- a/trunk/sound/pci/atiixp_modem.c +++ b/trunk/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; }