staging: comedi: addi_apci_3501: move range_apci3501_ao to driver

Move the analog output range definition from hwdrv_apci3501.c into
the main driver file.

For aesthetic reasons, rename the range table so it has namespace
associated with the driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: 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_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index bbdda4ec523ce8908efc692d923ec9834021fe16..9739e8b87bea3a0189620b391db2ac8b57dfcca4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -64,14 +64,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour
 #define ADDIDATA_TIMER                 0
 #define ADDIDATA_WATCHDOG              2
 
-/* ANALOG OUTPUT RANGE */
-static struct comedi_lrange range_apci3501_ao = {
-       2, {
-               BIP_RANGE(10),
-               UNI_RANGE(10)
-       }
-};
-
 /*
 +----------------------------------------------------------------------------+
 | Function   Name   : int i_APCI3501_ConfigAnalogOutput                      |

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index a7527a2fe4f062404cfa7d78aae5414811c6ee89..b4679b24dd7b5da9cf61a6ca285d4703cf10d09a 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -40,6 +40,13 @@ struct apci3501_private {
        unsigned char b_InterruptMode;
 };
 
+static struct comedi_lrange apci3501_ao_range = {
+       2, {
+               BIP_RANGE(10),
+               UNI_RANGE(10)
+       }
+};
+
 #include "addi-data/hwdrv_apci3501.c"
 
 static int apci3501_di_insn_bits(struct comedi_device *dev,
@@ -274,7 +281,7 @@ static int apci3501_auto_attach(struct comedi_device *dev,
                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
                s->n_chan       = ao_n_chan;
                s->maxdata      = 0x3fff;
-               s->range_table  = &range_apci3501_ao;
+               s->range_table  = &apci3501_ao_range;
                s->insn_config  = i_APCI3501_ConfigAnalogOutput;
                s->insn_write   = i_APCI3501_WriteAnalogOutput;
        } else {