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

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

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 beafb603
...@@ -1226,28 +1226,25 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev, ...@@ -1226,28 +1226,25 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev,
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&devpriv->ao_stop_spinlock, irqflags); spin_lock_irqsave(&devpriv->ao_stop_spinlock, irqflags);
if (devpriv->ao_cmd_started) { if (!devpriv->ao_cmd_started) {
spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags);
return 1;
}
/* Perform scan. */ /* Perform scan. */
if (devpriv->hwver < 2) { if (devpriv->hwver < 2) {
/* Not using DAC FIFO. */ /* Not using DAC FIFO. */
spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags);
irqflags);
pci230_handle_ao_nofifo(dev, s); pci230_handle_ao_nofifo(dev, s);
comedi_event(dev, s); comedi_event(dev, s);
} else { } else {
/* Using DAC FIFO. */ /* Using DAC FIFO. */
/* Read DACSWTRIG register to trigger conversion. */ /* Read DACSWTRIG register to trigger conversion. */
inw(devpriv->daqio + PCI230P2_DACSWTRIG); inw(devpriv->daqio + PCI230P2_DACSWTRIG);
spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags);
irqflags);
} }
/* Delay. Should driver be responsible for this? */ /* Delay. Should driver be responsible for this? */
/* XXX TODO: See if DAC busy bit can be used. */ /* XXX TODO: See if DAC busy bit can be used. */
udelay(8); udelay(8);
} else {
spin_unlock_irqrestore(&devpriv->ao_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