Commit 576694d8 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: me4000: absorb ai_write_timer()

This function is only called by me4000_ai_do_cmd(). Absorb it.
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 11e480c3
...@@ -635,26 +635,6 @@ static void me4000_ai_round_cmd_args(struct comedi_device *dev, ...@@ -635,26 +635,6 @@ static void me4000_ai_round_cmd_args(struct comedi_device *dev,
} }
} }
static void ai_write_timer(struct comedi_device *dev)
{
struct me4000_private *devpriv = dev->private;
outl(devpriv->ai_init_ticks - 1,
dev->iobase + ME4000_AI_SCAN_PRE_TIMER_LOW_REG);
outl(0x0, dev->iobase + ME4000_AI_SCAN_PRE_TIMER_HIGH_REG);
if (devpriv->ai_scan_ticks) {
outl(devpriv->ai_scan_ticks - 1,
dev->iobase + ME4000_AI_SCAN_TIMER_LOW_REG);
outl(0x0, dev->iobase + ME4000_AI_SCAN_TIMER_HIGH_REG);
}
outl(devpriv->ai_chan_ticks - 1,
dev->iobase + ME4000_AI_CHAN_PRE_TIMER_REG);
outl(devpriv->ai_chan_ticks - 1,
dev->iobase + ME4000_AI_CHAN_TIMER_REG);
}
static int me4000_ai_write_chanlist(struct comedi_device *dev, static int me4000_ai_write_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_cmd *cmd) struct comedi_cmd *cmd)
...@@ -695,7 +675,20 @@ static int me4000_ai_do_cmd(struct comedi_device *dev, ...@@ -695,7 +675,20 @@ static int me4000_ai_do_cmd(struct comedi_device *dev,
return err; return err;
/* Write timer arguments */ /* Write timer arguments */
ai_write_timer(dev); outl(devpriv->ai_init_ticks - 1,
dev->iobase + ME4000_AI_SCAN_PRE_TIMER_LOW_REG);
outl(0x0, dev->iobase + ME4000_AI_SCAN_PRE_TIMER_HIGH_REG);
if (devpriv->ai_scan_ticks) {
outl(devpriv->ai_scan_ticks - 1,
dev->iobase + ME4000_AI_SCAN_TIMER_LOW_REG);
outl(0x0, dev->iobase + ME4000_AI_SCAN_TIMER_HIGH_REG);
}
outl(devpriv->ai_chan_ticks - 1,
dev->iobase + ME4000_AI_CHAN_PRE_TIMER_REG);
outl(devpriv->ai_chan_ticks - 1,
dev->iobase + ME4000_AI_CHAN_TIMER_REG);
/* Reset control register */ /* Reset control register */
outl(0, dev->iobase + ME4000_AI_CTRL_REG); outl(0, dev->iobase + ME4000_AI_CTRL_REG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment