Commit b157f34f authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: pcl812: remove 'rangelist_ao' from boardinfo

The 'rangelist_ao' is the same for all board types. Remove this data
from the boardinfo.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 43669f4b
...@@ -339,7 +339,6 @@ struct pcl812_board { ...@@ -339,7 +339,6 @@ struct pcl812_board {
int ai_maxdata; int ai_maxdata;
unsigned int ai_ns_min; unsigned int ai_ns_min;
const struct comedi_lrange *rangelist_ai; const struct comedi_lrange *rangelist_ai;
const struct comedi_lrange *rangelist_ao;
unsigned int IRQbits; unsigned int IRQbits;
unsigned char DMAbits; unsigned char DMAbits;
unsigned char haveMPC508; unsigned char haveMPC508;
...@@ -356,7 +355,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -356,7 +355,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 33000, .ai_ns_min = 33000,
.rangelist_ai = &range_bipolar10, .rangelist_ai = &range_bipolar10,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -369,7 +367,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -369,7 +367,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 33000, .ai_ns_min = 33000,
.rangelist_ai = &range_pcl812pg_ai, .rangelist_ai = &range_pcl812pg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -382,7 +379,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -382,7 +379,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_pcl812pg_ai, .rangelist_ai = &range_pcl812pg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -396,7 +392,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -396,7 +392,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_acl8112dg_ai, .rangelist_ai = &range_acl8112dg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
.haveMPC508 = 1, .haveMPC508 = 1,
...@@ -411,7 +406,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -411,7 +406,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_acl8112hg_ai, .rangelist_ai = &range_acl8112hg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
.haveMPC508 = 1, .haveMPC508 = 1,
...@@ -426,7 +420,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -426,7 +420,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_pcl813b_ai, .rangelist_ai = &range_pcl813b_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0x000c, .IRQbits = 0x000c,
}, { }, {
.name = "a821pglnda", .name = "a821pglnda",
...@@ -448,7 +441,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -448,7 +441,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_a821pgh_ai, .rangelist_ai = &range_a821pgh_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0x000c, .IRQbits = 0x000c,
}, { }, {
.name = "a822pgl", .name = "a822pgl",
...@@ -461,7 +453,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -461,7 +453,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_acl8112dg_ai, .rangelist_ai = &range_acl8112dg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -475,7 +466,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -475,7 +466,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_acl8112hg_ai, .rangelist_ai = &range_acl8112hg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -489,7 +479,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -489,7 +479,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 8000, .ai_ns_min = 8000,
.rangelist_ai = &range_acl8112dg_ai, .rangelist_ai = &range_acl8112dg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -503,7 +492,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -503,7 +492,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0x0fff, .ai_maxdata = 0x0fff,
.ai_ns_min = 8000, .ai_ns_min = 8000,
.rangelist_ai = &range_acl8112hg_ai, .rangelist_ai = &range_acl8112hg_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, { }, {
...@@ -541,7 +529,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -541,7 +529,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0xffff, .ai_maxdata = 0xffff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_pcl813b2_ai, .rangelist_ai = &range_pcl813b2_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
.haveMPC508 = 1, .haveMPC508 = 1,
...@@ -556,7 +543,6 @@ static const struct pcl812_board boardtypes[] = { ...@@ -556,7 +543,6 @@ static const struct pcl812_board boardtypes[] = {
.ai_maxdata = 0xffff, .ai_maxdata = 0xffff,
.ai_ns_min = 10000, .ai_ns_min = 10000,
.rangelist_ai = &range_pcl813b2_ai, .rangelist_ai = &range_pcl813b2_ai,
.rangelist_ao = &range_unipolar5,
.IRQbits = 0xdcfc, .IRQbits = 0xdcfc,
.DMAbits = 0x0a, .DMAbits = 0x0a,
}, },
...@@ -1521,7 +1507,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1521,7 +1507,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->subdev_flags = SDF_WRITABLE | SDF_GROUND; s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
s->n_chan = board->n_aochan; s->n_chan = board->n_aochan;
s->maxdata = 0xfff; s->maxdata = 0xfff;
s->range_table = board->rangelist_ao; s->range_table = &range_unipolar5;
s->insn_read = pcl812_ao_insn_read; s->insn_read = pcl812_ao_insn_read;
s->insn_write = pcl812_ao_insn_write; s->insn_write = pcl812_ao_insn_write;
switch (board->board_type) { switch (board->board_type) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment