diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-26 16:17:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-28 11:14:04 -0800 |
| commit | c2733a92a64c7f0c48d873a8f75147a8ab33f399 (patch) | |
| tree | 159763d65f7926180a141a163622d5bcaa1f9ff6 | |
| parent | fc4e02175285c4642f50ad7b4070848d9e9f63f8 (diff) | |
staging: comedi: das16: absorb das16_ai_disable()
This function is only called by das16_cancel(). Absorb it to clarify code.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/das16.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 97e5e7dca954..2564af0f85f7 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -451,17 +451,6 @@ struct das16_private_struct { unsigned int can_burst:1; }; -static void das16_ai_disable(struct comedi_device *dev) -{ - struct das16_private_struct *devpriv = dev->private; - - /* disable interrupts, dma and pacer clocked conversions */ - devpriv->ctrl_reg &= ~(DAS16_CTRL_INTE | - DAS16_CTRL_DMAE | - DAS16_CTRL_PACING_MASK); - outb(devpriv->ctrl_reg, dev->iobase + DAS16_CTRL_REG); -} - static void das16_interrupt(struct comedi_device *dev) { struct das16_private_struct *devpriv = dev->private; @@ -772,7 +761,11 @@ static int das16_cancel(struct comedi_device *dev, struct comedi_subdevice *s) spin_lock_irqsave(&dev->spinlock, flags); - das16_ai_disable(dev); + /* disable interrupts, dma and pacer clocked conversions */ + devpriv->ctrl_reg &= ~(DAS16_CTRL_INTE | DAS16_CTRL_DMAE | + DAS16_CTRL_PACING_MASK); + outb(devpriv->ctrl_reg, dev->iobase + DAS16_CTRL_REG); + comedi_isadma_disable(dma->chan); /* disable SW timer */ |