redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: comedi: addi_apci_3120: absorb apci3120_ai_reset_fifo()

Browse source 
This function is only called by apci3120_set_chanlist(). Absorb it.

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 2014-11-04 10:55:32 -07:00 committed by Greg Kroah-Hartman
parent c58f9bb622
commit 34216792e0
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/comedi/drivers/addi_apci_3120.c
View file

@ -395,12 +395,6 @@ static void apci3120_exttrig_enable(struct comedi_device *dev, bool enable)
outw(devpriv->ctrl, dev->iobase + APCI3120_CTRL_REG);
}
static void apci3120_ai_reset_fifo(struct comedi_device *dev)
{
/* a dummy read of APCI3120_TIMER_MODE_REG resets the ai FIFO */
inw(dev->iobase + APCI3120_TIMER_MODE_REG);
}
static void apci3120_set_chanlist(struct comedi_device *dev,
struct comedi_subdevice *s,
int n_chan, unsigned int *chanlist)
@ -424,7 +418,8 @@ static void apci3120_set_chanlist(struct comedi_device *dev,
outw(val, dev->iobase + APCI3120_CHANLIST_REG);
}
apci3120_ai_reset_fifo(dev);
/* a dummy read of APCI3120_TIMER_MODE_REG resets the ai FIFO */
inw(dev->iobase + APCI3120_TIMER_MODE_REG);
/* set scan length (PR) and scan start (PA) */
devpriv->ctrl = APCI3120_CTRL_PR(n_chan - 1) | APCI3120_CTRL_PA(0);