staging: comedi: addi_apci_3120: move ai range table to driver source

Move the analog input comedi_lrange table from the included hwdrv_apci3120.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 0673e4fbc9b1d0ae41ccf24ca5c54c3316ec4b75..cb2856da34fb8bde4d579fdc2ea0cce4023e507e 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -125,20 +125,6 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 #define APCI3120_TIMER2_SELECT_EOS     0xc0
 #define APCI3120_COUNTER               3
 
-/* ANALOG INPUT RANGE */
-static const struct comedi_lrange range_apci3120_ai = {
-       8, {
-               BIP_RANGE(10),
-               BIP_RANGE(5),
-               BIP_RANGE(2),
-               BIP_RANGE(1),
-               UNI_RANGE(10),
-               UNI_RANGE(5),
-               UNI_RANGE(2),
-               UNI_RANGE(1)
-       }
-};
-
 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 8dfee45a0576a3773abd03bf0b0f2fa751c38529..6c7f452a2daecfcae824a8ca20cb0a4814d93cdf 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -53,6 +53,19 @@
 #define APCI3120_REVA_OSC_BASE                 70      /* 70ns = 14.29MHz */
 #define APCI3120_REVB_OSC_BASE                 50      /* 50ns = 20MHz */
 
+static const struct comedi_lrange apci3120_ai_range = {
+       8, {
+               BIP_RANGE(10),
+               BIP_RANGE(5),
+               BIP_RANGE(2),
+               BIP_RANGE(1),
+               UNI_RANGE(10),
+               UNI_RANGE(5),
+               UNI_RANGE(2),
+               UNI_RANGE(1)
+       }
+};
+
 enum apci3120_boardid {
        BOARD_APCI3120,
        BOARD_APCI3001,
@@ -355,7 +368,7 @@ static int apci3120_auto_attach(struct comedi_device *dev,
        s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
        s->n_chan       = 16;
        s->maxdata      = this_board->ai_is_16bit ? 0xffff : 0x0fff;
-       s->range_table  = &range_apci3120_ai;
+       s->range_table  = &apci3120_ai_range;
        s->insn_config  = apci3120_ai_insn_config;
        s->insn_read    = apci3120_ai_insn_read;
        if (0 /* dev->irq */) {