staging: comedi: addi_apci_3120: move apci3120_timer_enable() to driver source

Move this helper function from the included source file into the main driver
source file.

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-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 184bff4cabd344caa163b2cf8e0627cd847618b8..30e12986b6a38a1af3cce7a9953f16f51bb6ab3f 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -155,18 +155,6 @@ static const struct comedi_lrange range_apci3120_ai = {
        }
 };
 
-static void apci3120_timer_enable(struct comedi_device *dev,
-                                 unsigned int timer, bool enable)
-{
-       struct apci3120_private *devpriv = dev->private;
-
-       if (enable)
-               devpriv->ctrl |= APCI3120_CTRL_GATE(timer);
-       else
-               devpriv->ctrl &= ~APCI3120_CTRL_GATE(timer);
-       outw(devpriv->ctrl, dev->iobase + APCI3120_CTRL_REG);
-}
-
 static int apci3120_ai_insn_config(struct comedi_device *dev,
                                   struct comedi_subdevice *s,
                                   struct comedi_insn *insn,

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 014a01495ae2f8823dffecbcf339b2cacbade8d3..7bfb320d1312435782035090ec47c03c6be0b42d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -208,6 +208,18 @@ static void apci3120_timer_set_mode(struct comedi_device *dev,
        outb(devpriv->timer_mode, dev->iobase + APCI3120_TIMER_MODE_REG);
 }
 
+static void apci3120_timer_enable(struct comedi_device *dev,
+                                 unsigned int timer, bool enable)
+{
+       struct apci3120_private *devpriv = dev->private;
+
+       if (enable)
+               devpriv->ctrl |= APCI3120_CTRL_GATE(timer);
+       else
+               devpriv->ctrl &= ~APCI3120_CTRL_GATE(timer);
+       outw(devpriv->ctrl, dev->iobase + APCI3120_CTRL_REG);
+}
+
 #include "addi-data/hwdrv_apci3120.c"
 
 static void apci3120_dma_alloc(struct comedi_device *dev)