Skip to content

Commit

Permalink
[ALSA] Remove superfluous macros
Browse files Browse the repository at this point in the history 
Modules: ATIIXP driver,ATIIXP-modem driver

Remove superfluous macros for delay.
Call appropriate functions directly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent 03f9ae2 commit bfdcbac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
12 changes: 3 additions & 9 deletions sound/pci/atiixp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
Expand Down
12 changes: 3 additions & 9 deletions sound/pci/atiixp_modem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit bfdcbac

Please sign in to comment.