summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-08-14 18:24:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-15 15:25:34 -0700
commitf2eacff1369c46c7c4dab595a460dd9ec40e51db (patch)
tree6a7f9ab7da0e5ac0eeb5ec418dfb084a4f48d567
parent690e839fc4915a372f2338b148c36d8949822253 (diff)
staging: comedi: dnya_pci10xx: cleanup the analog output range
The analog output channels on this board only support a single range, 0-10V unipolar. This range is available as an exported symbol from the comedi core and "range_unipolar10". Use that instead of duplicating the range in this driver and remove the information from the boardinfo. 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>
-rw-r--r--drivers/staging/comedi/drivers/dyna_pci10xx.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 15048aa72e1a..abfbb12056ef 100644
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -54,13 +54,6 @@ static const struct comedi_lrange range_pci1050_ai = { 3, {
static const char range_codes_pci1050_ai[] = { 0x00, 0x10, 0x30 };
-static const struct comedi_lrange range_pci1050_ao = { 1, {
- UNI_RANGE(10)
- }
-};
-
-static const char range_codes_pci1050_ao[] = { 0x00 };
-
struct boardtype {
const char *name;
int device_id;
@@ -74,8 +67,6 @@ struct boardtype {
int do_bits;
const struct comedi_lrange *range_ai;
const char *range_codes_ai;
- const struct comedi_lrange *range_ao;
- const char *range_codes_ao;
};
static const struct boardtype boardtypes[] = {
@@ -92,8 +83,6 @@ static const struct boardtype boardtypes[] = {
.do_bits = 16,
.range_ai = &range_pci1050_ai,
.range_codes_ai = range_codes_pci1050_ai,
- .range_ao = &range_pci1050_ao,
- .range_codes_ao = range_codes_pci1050_ao,
},
/* dummy entry corresponding to driver name */
{.name = DRV_NAME},
@@ -290,7 +279,7 @@ static int dyna_pci10xx_attach_pci(struct comedi_device *dev,
s->subdev_flags = SDF_WRITABLE;
s->n_chan = thisboard->ao_chans;
s->maxdata = 0x0FFF;
- s->range_table = thisboard->range_ao;
+ s->range_table = &range_unipolar10;
s->len_chanlist = 16;
s->insn_write = dyna_pci10xx_insn_write_ao;