forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
All the board types have 12-bit analog outputs. Remove this data from
the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-02-17 14:27:12 -07:00 • committed by Greg Kroah-Hartman
commit 2bfe3eb76f
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/comedi/drivers/pcl818.c
View file

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