diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-11-04 20:55:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 20:34:06 +0300 |
| commit | 34216792e006d70bcfdf1931e24e4eb2e2af9498 (patch) | |
| tree | 5a62c1c3aae4e0ef530acf6979bbe27b9a68a632 | |
| parent | c58f9bb622ca06387200a6f9ef77cdc5c531dfb2 (diff) | |
| download | linux-34216792e006d70bcfdf1931e24e4eb2e2af9498.tar.xz | |
staging: comedi: addi_apci_3120: absorb apci3120_ai_reset_fifo()
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3120.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c index f00b9ba070b7..e9816e7a235d 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3120.c +++ b/drivers/staging/comedi/drivers/addi_apci_3120.c @@ -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); |