From: H Hartley Sweeten Date: Mon, 26 Jan 2015 23:17:15 +0000 (-0700) Subject: staging: comedi: das16: absorb das16_ai_disable() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c2733a92a64c7f0c48d873a8f75147a8ab33f399;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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 */