Skip to content

Commit

Permalink
staging: comedi: dnya_pci10xx: cleanup the analog output range
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Aug 15, 2012
1 parent 690e839 commit f2eacff
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/staging/comedi/drivers/dyna_pci10xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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[] = {
Expand All @@ -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},
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit f2eacff

Please sign in to comment.