staging: comedi: addi_apci_3120: move apci3120_addon_write() to driver

Move this function from the included 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 3cbcc0c9fb4834a0be51aa4d3a374b79cab65463..1799833cde3285d6d0bc67edc6a24fd4f7903c0b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -1,17 +1,3 @@
-static void apci3120_addon_write(struct comedi_device *dev,
-                                unsigned int val, unsigned int reg)
-{
-       struct apci3120_private *devpriv = dev->private;
-
-       /* 16-bit interface for AMCC add-on registers */
-
-       outw(reg, devpriv->addon + APCI3120_ADDON_ADDR_REG);
-       outw(val & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
-
-       outw(reg + 2, devpriv->addon + APCI3120_ADDON_ADDR_REG);
-       outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
-}
-
 static int apci3120_cancel(struct comedi_device *dev,
                           struct comedi_subdevice *s)
 {

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 4f1ec0bc645f702f6e4ea4008151ce938a96ec68..dab81cbe79da1cceed68a7b8a1a5cab2a450828d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -163,6 +163,20 @@ struct apci3120_private {
        unsigned short ctrl;
 };
 
+static void apci3120_addon_write(struct comedi_device *dev,
+                                unsigned int val, unsigned int reg)
+{
+       struct apci3120_private *devpriv = dev->private;
+
+       /* 16-bit interface for AMCC add-on registers */
+
+       outw(reg, devpriv->addon + APCI3120_ADDON_ADDR_REG);
+       outw(val & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
+
+       outw(reg + 2, devpriv->addon + APCI3120_ADDON_ADDR_REG);
+       outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
+}
+
 /*
  * There are three timers on the board. They all use the same base
  * clock with a fixed prescaler for each timer. The base clock used