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>

diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c
index 97e5e7dca954671875ce1e8acb60001bf7d131b6..2564af0f85f7c458670a06f6d8ebd221104d1b05 100644 (file)
--- 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 */