iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: das16: absorb das16_ai_disable()

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2015-01-26 16:17:15 -07:00 committed by Greg Kroah-Hartman
parent fc4e021752
commit c2733a92a6
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/comedi/drivers/das16.c
View File

@ -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 */