ripped out some settling delays

diff --git a/comedi/drivers/amplc_pci230.c b/comedi/drivers/amplc_pci230.c
index 013e11af44b723a117c572b66ad2fbf79db03e86..c1e85b369e8469a95afbd0a25502ea040f16a644 100644 (file)
--- a/comedi/drivers/amplc_pci230.c
+++ b/comedi/drivers/amplc_pci230.c
@@ -518,9 +518,6 @@ static int pci230_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *i
        /* Specify uni/bip, se/diff, s/w conversion, and reset FIFO (even though we're not using it - MEV says so). */
        outw_p(adccon, dev->iobase + PCI230_ADCCON);
 
-       /* Wait for mux to settle */
-       udelay(PCI230_MUX_SETTLE);
-
        /* Convert n samples */
        for(n=0;n<insn->n;n++){
                /* trigger conversion */
@@ -571,14 +568,6 @@ static int pci230_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *i
 
                /* Write value to DAC. */
                pci230_ao_write(dev, data[i], chan);
-
-#if 0
-               /* XXX screw the user.  Only do this if the board gets upset if you don't */
-               /* If we're writing more than one sample, wait for output to settle between successive writes */
-               if (insn->n > 1) {
-               udelay(PCI230_DAC_SETTLE);
-               }
-#endif
        }
 
        /* return the number of samples read/written */

diff --git a/comedi/drivers/cb_pcimdas.c b/comedi/drivers/cb_pcimdas.c
index 4bbe8bae121b5b4caccb2eecadc50f5ddc843ab2..896747ae663d33bd3a3656fa52e6870d651facde 100644 (file)
--- a/comedi/drivers/cb_pcimdas.c
+++ b/comedi/drivers/cb_pcimdas.c
@@ -467,9 +467,6 @@ static int cb_pcimdas_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_ins
        chanlims=chan | (chan<<4);
        outb(chanlims,devpriv->BADR3+0);
 
-       /* wait for mux to settle */
-       udelay(10); //docs say wait 10µs
-
        /* convert n samples */
        for(n=0;n<insn->n;n++){
                /* trigger conversion */

diff --git a/comedi/drivers/das08.c b/comedi/drivers/das08.c
index 6bc999dc8763e63dd6e44dbb7087c4f583829ed2..16f9fce07799dfa9f773121c7dd9f0516cbe528d 100644 (file)
--- a/comedi/drivers/das08.c
+++ b/comedi/drivers/das08.c
@@ -556,9 +556,6 @@ static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
                outb(devpriv->pg_gainlist[range],dev->iobase+DAS08AO_GAIN_CONTROL);
        }
 
-       /* wait for MUX to settle */
-       udelay(2);
-
        for(n=0;n<insn->n;n++){
                /* clear over-range bits for 16-bit boards */
                if (thisboard->ai_nbits == 16)