aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pcmcia
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 04:21:19 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:16:37 -0500
commitbdbae7e62837c22c5399df0789a24e9d8a1d675f (patch)
tree4bffa9bf42f5b7541bc432f8b2437e8130278f88 /sound/pcmcia
parentc8eb6ba16a5803fab9cc0d1d0dd04a75bf91b6d5 (diff)
[ALSA] Remove snd_vx_delay() function
Replace snd_vx_delay() with appropriate delay/sleep functions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia')
-rw-r--r--sound/pcmcia/vx/vxp_ops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pcmcia/vx/vxp_ops.c b/sound/pcmcia/vx/vxp_ops.c
index 6f15c3d03ab5..2754d657a4d6 100644
--- a/sound/pcmcia/vx/vxp_ops.c
+++ b/sound/pcmcia/vx/vxp_ops.c
@@ -96,7 +96,7 @@ static int vx_check_magic(vx_core_t *chip)
96 c = vx_inb(chip, CDSP); 96 c = vx_inb(chip, CDSP);
97 if (c == CDSP_MAGIC) 97 if (c == CDSP_MAGIC)
98 return 0; 98 return 0;
99 snd_vx_delay(chip, 10); 99 msleep(10);
100 } while (time_after_eq(end_time, jiffies)); 100 } while (time_after_eq(end_time, jiffies));
101 snd_printk(KERN_ERR "cannot find xilinx magic word (%x)\n", c); 101 snd_printk(KERN_ERR "cannot find xilinx magic word (%x)\n", c);
102 return -EIO; 102 return -EIO;
@@ -134,12 +134,12 @@ static void vxp_reset_codec(vx_core_t *_chip)
134 /* Set the reset CODEC bit to 1. */ 134 /* Set the reset CODEC bit to 1. */
135 vx_outb(chip, CDSP, chip->regCDSP | VXP_CDSP_CODEC_RESET_MASK); 135 vx_outb(chip, CDSP, chip->regCDSP | VXP_CDSP_CODEC_RESET_MASK);
136 vx_inb(chip, CDSP); 136 vx_inb(chip, CDSP);
137 snd_vx_delay(_chip, 10); 137 msleep(10);
138 /* Set the reset CODEC bit to 0. */ 138 /* Set the reset CODEC bit to 0. */
139 chip->regCDSP &= ~VXP_CDSP_CODEC_RESET_MASK; 139 chip->regCDSP &= ~VXP_CDSP_CODEC_RESET_MASK;
140 vx_outb(chip, CDSP, chip->regCDSP); 140 vx_outb(chip, CDSP, chip->regCDSP);
141 vx_inb(chip, CDSP); 141 vx_inb(chip, CDSP);
142 snd_vx_delay(_chip, 1); 142 msleep(1);
143} 143}
144 144
145/* 145/*
@@ -207,7 +207,7 @@ static int vxp_load_xilinx_binary(vx_core_t *_chip, const struct firmware *fw)
207 vx_outb(chip, ICR, ICR_HF0); 207 vx_outb(chip, ICR, ICR_HF0);
208 208
209 /* TEMPO 250ms : wait until Xilinx is downloaded */ 209 /* TEMPO 250ms : wait until Xilinx is downloaded */
210 snd_vx_delay(_chip, 300); 210 msleep(300);
211 211
212 /* test magical word */ 212 /* test magical word */
213 if (vx_check_magic(_chip) < 0) 213 if (vx_check_magic(_chip) < 0)
@@ -221,7 +221,7 @@ static int vxp_load_xilinx_binary(vx_core_t *_chip, const struct firmware *fw)
221 chip->regDIALOG |= VXP_DLG_XILINX_REPROG_MASK; 221 chip->regDIALOG |= VXP_DLG_XILINX_REPROG_MASK;
222 vx_outb(chip, DIALOG, chip->regDIALOG); 222 vx_outb(chip, DIALOG, chip->regDIALOG);
223 vx_inb(chip, DIALOG); 223 vx_inb(chip, DIALOG);
224 snd_vx_delay(_chip, 10); 224 msleep(10);
225 chip->regDIALOG &= ~VXP_DLG_XILINX_REPROG_MASK; 225 chip->regDIALOG &= ~VXP_DLG_XILINX_REPROG_MASK;
226 vx_outb(chip, DIALOG, chip->regDIALOG); 226 vx_outb(chip, DIALOG, chip->regDIALOG);
227 vx_inb(chip, DIALOG); 227 vx_inb(chip, DIALOG);