Commit a6303f15 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: amplc_pci230: reduce indentation in pci230_ai_inttrig_convert()

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a046e4c1
...@@ -1802,22 +1802,22 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev, ...@@ -1802,22 +1802,22 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev,
{ {
struct pci230_private *devpriv = dev->private; struct pci230_private *devpriv = dev->private;
unsigned long irqflags; unsigned long irqflags;
unsigned int delayus;
if (trig_num) if (trig_num)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags); spin_lock_irqsave(&devpriv->ai_stop_spinlock, irqflags);
if (devpriv->ai_cmd_started) { if (!devpriv->ai_cmd_started) {
unsigned int delayus; spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags);
return 1;
}
/* /*
* Trigger conversion by toggling Z2-CT2 output. * Trigger conversion by toggling Z2-CT2 output.
* Finish with output high. * Finish with output high.
*/ */
i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE0);
2, I8254_MODE0); i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0, 2, I8254_MODE1);
i8254_set_mode(dev->iobase + PCI230_Z2_CT_BASE, 0,
2, I8254_MODE1);
/* /*
* Delay. Should driver be responsible for this? An * Delay. Should driver be responsible for this? An
* alternative would be to wait until conversion is complete, * alternative would be to wait until conversion is complete,
...@@ -1825,8 +1825,8 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev, ...@@ -1825,8 +1825,8 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev,
* bit has a different meaning when FIFO enabled (and when * bit has a different meaning when FIFO enabled (and when
* FIFO not enabled, it only works for software triggers). * FIFO not enabled, it only works for software triggers).
*/ */
if ((devpriv->adccon & PCI230_ADC_IM_MASK) == if ((devpriv->adccon & PCI230_ADC_IM_MASK) == PCI230_ADC_IM_DIF &&
PCI230_ADC_IM_DIF && devpriv->hwver == 0) { devpriv->hwver == 0) {
/* PCI230/260 in differential mode */ /* PCI230/260 in differential mode */
delayus = 8; delayus = 8;
} else { } else {
...@@ -1835,10 +1835,6 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev, ...@@ -1835,10 +1835,6 @@ static int pci230_ai_inttrig_convert(struct comedi_device *dev,
} }
spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags); spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags);
udelay(delayus); udelay(delayus);
} else {
spin_unlock_irqrestore(&devpriv->ai_stop_spinlock, irqflags);
}
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment