4 files changed, 15 insertions, 30 deletions

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 7a60a3888667..43c901bf7c1f 100644
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -274,8 +274,6 @@ static inline void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val)
 #define vx_inl(chip,reg)        snd_vx_inl(chip, VX_##reg)
 #define vx_outl(chip,reg,val)   snd_vx_outl(chip, VX_##reg,val)
 
-void snd_vx_delay(vx_core_t *chip, int msec);
-
 static inline void vx_reset_dsp(vx_core_t *chip)
 {
         snd_assert(chip->ops->reset_dsp, return);
diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c
index 4697b1d75cbb..e6e4cf997419 100644
--- a/sound/drivers/vx/vx_core.c
+++ b/sound/drivers/vx/vx_core.c
@@ -41,18 +41,6 @@ MODULE_LICENSE("GPL");
 
 
 /*
- * snd_vx_delay - delay for the specified time
- * @xmsec: the time to delay in msec
- */
-void snd_vx_delay(vx_core_t *chip, int xmsec)
-{
-        if (! in_interrupt() && xmsec >= 1000 / HZ)
-                msleep(xmsec);
-        else
-                mdelay(xmsec);
-}
-
-/*
  * vx_check_reg_bit - wait for the specified bit is set/reset on a register
  * @reg: register to check
  * @mask: bit mask
@@ -76,7 +64,7 @@ int snd_vx_check_reg_bit(vx_core_t *chip, int reg, int mask, int bit, int time)
         do {
                 if ((snd_vx_inb(chip, reg) & mask) == bit)
                         return 0;
-                //snd_vx_delay(chip, 10);
+                //msleep(10);
         } while (time_after_eq(end_time, jiffies));
         snd_printd(KERN_DEBUG "vx_check_reg_bit: timeout, reg=%s, mask=0x%x, val=0x%x\n", reg_names[reg], mask, snd_vx_inb(chip, reg));
         return -EIO;
@@ -664,7 +652,7 @@ int snd_vx_dsp_boot(vx_core_t *chip, const struct firmware *boot)
 
         if ((err = snd_vx_load_boot_image(chip, boot)) < 0)
                 return err;
-        snd_vx_delay(chip, 10);
+        msleep(10);
 
         return 0;
 }
@@ -704,7 +692,7 @@ int snd_vx_dsp_load(vx_core_t *chip, const struct firmware *dsp)
         }
         snd_printdd(KERN_DEBUG "checksum = 0x%08x\n", csum);
 
-        snd_vx_delay(chip, 200);
+        msleep(200);
 
         if ((err = vx_wait_isr_bit(chip, ISR_CHK)) < 0)
                 return err;
@@ -831,7 +819,6 @@ EXPORT_SYMBOL(snd_vx_create);
 EXPORT_SYMBOL(snd_vx_setup_firmware);
 EXPORT_SYMBOL(snd_vx_free_firmware);
 EXPORT_SYMBOL(snd_vx_irq_handler);
-EXPORT_SYMBOL(snd_vx_delay);
 EXPORT_SYMBOL(snd_vx_dsp_boot);
 EXPORT_SYMBOL(snd_vx_dsp_load);
 EXPORT_SYMBOL(snd_vx_load_boot_image);
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c
index 967bd5e6b23c..2d4d0c29b4c4 100644
--- a/sound/pci/vx222/vx222_ops.c
+++ b/sound/pci/vx222/vx222_ops.c
@@ -154,7 +154,7 @@ static void vx2_reset_dsp(vx_core_t *_chip)
         /* set the reset dsp bit to 0 */
         vx_outl(chip, CDSP, chip->regCDSP & ~VX_CDSP_DSP_RESET_MASK);
 
-        snd_vx_delay(_chip, XX_DSP_RESET_WAIT_TIME);
+        mdelay(XX_DSP_RESET_WAIT_TIME);
 
         chip->regCDSP |= VX_CDSP_DSP_RESET_MASK;
         /* set the reset dsp bit to 1 */
@@ -362,10 +362,10 @@ static int vx2_load_xilinx_binary(vx_core_t *chip, const struct firmware *xilinx
         /* XILINX reset (wait at least 1 milisecond between reset on and off). */
         vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK);
         vx_inl(chip, CNTRL);
-        snd_vx_delay(chip, 10);
+        msleep(10);
         vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE);
         vx_inl(chip, CNTRL);
-        snd_vx_delay(chip, 10);
+        msleep(10);
 
         if (chip->type == VX_TYPE_BOARD)
                 port = VX_CNTRL;
@@ -381,7 +381,7 @@ static int vx2_load_xilinx_binary(vx_core_t *chip, const struct firmware *xilinx
         }
         put_xilinx_data(chip, port, 4, 0xff); /* end signature */
 
-        snd_vx_delay(chip, 200);
+        msleep(200);
 
         /* test after loading (is buggy with VX222) */
         if (chip->type != VX_TYPE_BOARD) {
@@ -720,17 +720,17 @@ static void vx2_reset_codec(vx_core_t *_chip)
         /* Set the reset CODEC bit to 0. */
         vx_outl(chip, CDSP, chip->regCDSP &~ VX_CDSP_CODEC_RESET_MASK);
         vx_inl(chip, CDSP);
-        snd_vx_delay(_chip, 10);
+        msleep(10);
         /* Set the reset CODEC bit to 1. */
         chip->regCDSP |= VX_CDSP_CODEC_RESET_MASK;
         vx_outl(chip, CDSP, chip->regCDSP);
         vx_inl(chip, CDSP);
         if (_chip->type == VX_TYPE_BOARD) {
-                snd_vx_delay(_chip, 1);
+                msleep(1);
                 return;
         }
 
-        snd_vx_delay(_chip, 5);  /* additionnel wait time for AKM's */
+        msleep(5);  /* additionnel wait time for AKM's */
 
         vx2_write_codec_reg(_chip, AKM_CODEC_POWER_CONTROL_CMD); /* DAC power up, ADC power up, Vref power down */
         
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)
                 c = vx_inb(chip, CDSP);
                 if (c == CDSP_MAGIC)
                         return 0;
-                snd_vx_delay(chip, 10);
+                msleep(10);
         } while (time_after_eq(end_time, jiffies));
         snd_printk(KERN_ERR "cannot find xilinx magic word (%x)\n", c);
         return -EIO;
@@ -134,12 +134,12 @@ static void vxp_reset_codec(vx_core_t *_chip)
         /* Set the reset CODEC bit to 1. */
         vx_outb(chip, CDSP, chip->regCDSP | VXP_CDSP_CODEC_RESET_MASK);
         vx_inb(chip, CDSP);
-        snd_vx_delay(_chip, 10);
+        msleep(10);
         /* Set the reset CODEC bit to 0. */
         chip->regCDSP &= ~VXP_CDSP_CODEC_RESET_MASK;
         vx_outb(chip, CDSP, chip->regCDSP);
         vx_inb(chip, CDSP);
-        snd_vx_delay(_chip, 1);
+        msleep(1);
 }
 
 /*
@@ -207,7 +207,7 @@ static int vxp_load_xilinx_binary(vx_core_t *_chip, const struct firmware *fw)
         vx_outb(chip, ICR, ICR_HF0);
 
         /* TEMPO 250ms : wait until Xilinx is downloaded */
-        snd_vx_delay(_chip, 300);
+        msleep(300);
 
         /* test magical word */
         if (vx_check_magic(_chip) < 0)
@@ -221,7 +221,7 @@ static int vxp_load_xilinx_binary(vx_core_t *_chip, const struct firmware *fw)
         chip->regDIALOG |= VXP_DLG_XILINX_REPROG_MASK;
         vx_outb(chip, DIALOG, chip->regDIALOG);
         vx_inb(chip, DIALOG);
-        snd_vx_delay(_chip, 10);
+        msleep(10);
         chip->regDIALOG &= ~VXP_DLG_XILINX_REPROG_MASK;
         vx_outb(chip, DIALOG, chip->regDIALOG);
         vx_inb(chip, DIALOG);