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>

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index f00b9ba070b7c2099d8fb5f983f70e0a620bd632..e9816e7a235df76211ba727fff7e64e177111614 100644 (file)
--- 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);