Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7157fda4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das16: absorb das16_ai_enable() 



This function is only called by das16_cmd_exec(). Absorb it to clarify code.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c18a05c

drivers/staging/comedi/drivers/das16.c

+8 −18
Original line number Original line Diff line number Diff line
@@ -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);