From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Wed, 23 Jan 2013 19:44:17 +0000 (-0700)
Subject: staging: comedi: addi_apci_3501: move range_apci3501_ao to driver
X-Git-Tag: firefly_0821_release~3680^2~1080^2~289
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=99c9fa48b6bbc640066c414d6b413a1f1b4aa857;p=firefly-linux-kernel-4.4.55.git

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 bbdda4ec523c..9739e8b87bea 100644
--- 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 a7527a2fe4f0..b4679b24dd7b 100644
--- 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 {