staging: comedi: addi_apci_3120: move apci3120_reset() 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 f5948fd8b4214c87b052dc9144bd9cec42464ddb..c310cf32b1d8d66e36180da15825d5eb4b4ff3cc 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -72,18 +72,6 @@ static void apci3120_addon_write(struct comedi_device *dev,
        outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);
 }
 
-static void apci3120_reset(struct comedi_device *dev)
-{
-       /* disable all interrupt sources */
-       outb(0, dev->iobase + APCI3120_MODE_REG);
-
-       /* disable all counters, ext trigger, and reset scan */
-       outw(0, dev->iobase + APCI3120_CTRL_REG);
-
-       /* clear interrupt status */
-       inw(dev->iobase + APCI3120_STATUS_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 7ad7621e74e066794844cf98477bb44d5ddb0813..79a96acc8b63e5d799416c874b133629d1a7a424 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -491,6 +491,18 @@ static void apci3120_dma_free(struct comedi_device *dev)
        }
 }
 
+static void apci3120_reset(struct comedi_device *dev)
+{
+       /* disable all interrupt sources */
+       outb(0, dev->iobase + APCI3120_MODE_REG);
+
+       /* disable all counters, ext trigger, and reset scan */
+       outw(0, dev->iobase + APCI3120_CTRL_REG);
+
+       /* clear interrupt status */
+       inw(dev->iobase + APCI3120_STATUS_REG);
+}
+
 static int apci3120_auto_attach(struct comedi_device *dev,
                                unsigned long context)
 {