evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: das16: absorb das16_ai_enable()

Browse source 
This function is only called by das16_cmd_exec(). 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:13 -07:00 • committed by Greg Kroah-Hartman
parent 9c18a05c45
commit 7157fda400
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/staging/comedi/drivers/das16.c
View file

@ -451,23 +451,6 @@ struct das16_private_struct {
unsigned int can_burst:1; unsigned int can_burst:1;
}; };
static void das16_ai_enable(struct comedi_device *dev,
unsigned int mode, unsigned int src)
{
struct das16_private_struct *devpriv = dev->private;
devpriv->ctrl_reg &= ~(DAS16_CTRL_INTE |
DAS16_CTRL_DMAE |
DAS16_CTRL_PACING_MASK);
devpriv->ctrl_reg |= mode;
if (src == TRIG_EXT)
devpriv->ctrl_reg |= DAS16_CTRL_EXT_PACER;
else
devpriv->ctrl_reg |= DAS16_CTRL_INT_PACER;
outb(devpriv->ctrl_reg, dev->iobase + DAS16_CTRL_REG);
}
static void das16_ai_disable(struct comedi_device *dev) static void das16_ai_disable(struct comedi_device *dev)
{ {
struct das16_private_struct *devpriv = dev->private; struct das16_private_struct *devpriv = dev->private;
@ -765,7 +748,14 @@ static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->timer.expires = jiffies + timer_period(); devpriv->timer.expires = jiffies + timer_period();
add_timer(&devpriv->timer); add_timer(&devpriv->timer);
das16_ai_enable(dev, DAS16_CTRL_DMAE, cmd->convert_src); /* enable DMA interrupt with external or internal pacing */
devpriv->ctrl_reg &= ~(DAS16_CTRL_INTE | DAS16_CTRL_PACING_MASK);
devpriv->ctrl_reg |= DAS16_CTRL_DMAE;
if (cmd->convert_src == TRIG_EXT)
devpriv->ctrl_reg |= DAS16_CTRL_EXT_PACER;
else
devpriv->ctrl_reg |= DAS16_CTRL_INT_PACER;
outb(devpriv->ctrl_reg, dev->iobase + DAS16_CTRL_REG);
if (devpriv->can_burst) if (devpriv->can_burst)
outb(0, dev->iobase + DAS1600_CONV_REG); outb(0, dev->iobase + DAS1600_CONV_REG);