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

Move this function from the included hwdrv_apci31210.c source file to 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 7bd17c28ebae52d25a4652f8276ff8cfa54b446e..d577d37de0bcdea4c3a33025a328fc18d8f6aee9 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -1031,24 +1031,6 @@ static int apci3120_di_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static int apci3120_do_insn_bits(struct comedi_device *dev,
-                                struct comedi_subdevice *s,
-                                struct comedi_insn *insn,
-                                unsigned int *data)
-{
-       struct apci3120_private *devpriv = dev->private;
-
-       if (comedi_dio_update_state(s, data)) {
-               devpriv->do_bits = s->state;
-               outb(APCI3120_CTR0_DO_BITS(devpriv->do_bits),
-                    dev->iobase + APCI3120_CTR0_REG);
-       }
-
-       data[1] = s->state;
-
-       return insn->n;
-}
-
 static int apci3120_ao_ready(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 98de447d96b7f66c7532cba100aafc246d186c53..22d17e2aafbe87e7f2f50334cff2a7a0826acf6d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -281,6 +281,24 @@ static void apci3120_ai_reset_fifo(struct comedi_device *dev)
 
 #include "addi-data/hwdrv_apci3120.c"
 
+static int apci3120_do_insn_bits(struct comedi_device *dev,
+                                struct comedi_subdevice *s,
+                                struct comedi_insn *insn,
+                                unsigned int *data)
+{
+       struct apci3120_private *devpriv = dev->private;
+
+       if (comedi_dio_update_state(s, data)) {
+               devpriv->do_bits = s->state;
+               outb(APCI3120_CTR0_DO_BITS(devpriv->do_bits),
+                    dev->iobase + APCI3120_CTR0_REG);
+       }
+
+       data[1] = s->state;
+
+       return insn->n;
+}
+
 static void apci3120_dma_alloc(struct comedi_device *dev)
 {
        struct apci3120_private *devpriv = dev->private;