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

staging: comedi: pcl818: remove 'ao_maxdata' from boardinfo

All the board types have 12-bit analog outputs. 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 bca1b594
...@@ -261,7 +261,6 @@ struct pcl818_board { ...@@ -261,7 +261,6 @@ struct pcl818_board {
unsigned int ns_min; unsigned int ns_min;
int n_aochan; int n_aochan;
const struct comedi_lrange *ai_range_type; const struct comedi_lrange *ai_range_type;
int ao_maxdata;
unsigned int has_dma:1; unsigned int has_dma:1;
unsigned int has_fifo:1; unsigned int has_fifo:1;
unsigned int is_818:1; unsigned int is_818:1;
...@@ -273,7 +272,6 @@ static const struct pcl818_board boardtypes[] = { ...@@ -273,7 +272,6 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 25000, .ns_min = 25000,
.n_aochan = 1, .n_aochan = 1,
.ai_range_type = &range_pcl818l_l_ai, .ai_range_type = &range_pcl818l_l_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.is_818 = 1, .is_818 = 1,
}, { }, {
...@@ -281,7 +279,6 @@ static const struct pcl818_board boardtypes[] = { ...@@ -281,7 +279,6 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 10000, .ns_min = 10000,
.n_aochan = 1, .n_aochan = 1,
.ai_range_type = &range_pcl818h_ai, .ai_range_type = &range_pcl818h_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.is_818 = 1, .is_818 = 1,
}, { }, {
...@@ -289,7 +286,6 @@ static const struct pcl818_board boardtypes[] = { ...@@ -289,7 +286,6 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 10000, .ns_min = 10000,
.n_aochan = 1, .n_aochan = 1,
.ai_range_type = &range_pcl818h_ai, .ai_range_type = &range_pcl818h_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.has_fifo = 1, .has_fifo = 1,
.is_818 = 1, .is_818 = 1,
...@@ -298,7 +294,6 @@ static const struct pcl818_board boardtypes[] = { ...@@ -298,7 +294,6 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 10000, .ns_min = 10000,
.n_aochan = 1, .n_aochan = 1,
.ai_range_type = &range_pcl818hg_ai, .ai_range_type = &range_pcl818hg_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.has_fifo = 1, .has_fifo = 1,
.is_818 = 1, .is_818 = 1,
...@@ -307,7 +302,6 @@ static const struct pcl818_board boardtypes[] = { ...@@ -307,7 +302,6 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 10000, .ns_min = 10000,
.n_aochan = 2, .n_aochan = 2,
.ai_range_type = &range_pcl818h_ai, .ai_range_type = &range_pcl818h_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.is_818 = 1, .is_818 = 1,
}, { }, {
...@@ -315,13 +309,11 @@ static const struct pcl818_board boardtypes[] = { ...@@ -315,13 +309,11 @@ static const struct pcl818_board boardtypes[] = {
.ns_min = 16000, .ns_min = 16000,
.n_aochan = 2, .n_aochan = 2,
.ai_range_type = &range_unipolar5, .ai_range_type = &range_unipolar5,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
}, { }, {
.name = "pcm3718", .name = "pcm3718",
.ns_min = 10000, .ns_min = 10000,
.ai_range_type = &range_pcl818h_ai, .ai_range_type = &range_pcl818h_ai,
.ao_maxdata = 0xfff,
.has_dma = 1, .has_dma = 1,
.is_818 = 1, .is_818 = 1,
}, },
...@@ -1405,7 +1397,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -1405,7 +1397,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->type = COMEDI_SUBD_AO; s->type = COMEDI_SUBD_AO;
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 = board->ao_maxdata; s->maxdata = 0x0fff;
s->range_table = &range_unipolar5; s->range_table = &range_unipolar5;
s->insn_read = pcl818_ao_insn_read; s->insn_read = pcl818_ao_insn_read;
s->insn_write = pcl818_ao_insn_write; s->insn_write = pcl818_ao_insn_write;
......
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