UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: icp_multi: remove ai_maxdata from boardinfo 

The analog inputs of this board always have 12-bit resolution.
Remove the boardinfo and just open-code the value.

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>
This commit is contained in:
H Hartley Sweeten 2012-09-11 13:47:36 -07:00 committed by Greg Kroah-Hartman
parent 68b82e0954
commit efac035ca6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/comedi/drivers/icp_multi.c
View File

@ -130,7 +130,6 @@ struct boardtype {
int iorange; /* I/O range len */ int iorange; /* I/O range len */
char have_irq; /* 1=card support IRQ */ char have_irq; /* 1=card support IRQ */
char cardtype; /* 0=ICP Multi */ char cardtype; /* 0=ICP Multi */
int ai_maxdata; /* resolution of A/D */
const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */ const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */
const char *rangecode; /* range codes for programming */ const char *rangecode; /* range codes for programming */
const struct comedi_lrange *rangelist_ao; /* rangelist for D/A */ const struct comedi_lrange *rangelist_ao; /* rangelist for D/A */
@ -804,7 +803,7 @@ static int icp_multi_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_AI; s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF;
s->n_chan = 16; s->n_chan = 16;
s->maxdata = this_board->ai_maxdata; s->maxdata = 0x0fff;
s->len_chanlist = 16; s->len_chanlist = 16;
s->range_table = this_board->rangelist_ai; s->range_table = this_board->rangelist_ai;
s->insn_read = icp_multi_insn_read_ai; s->insn_read = icp_multi_insn_read_ai;
@ -882,7 +881,6 @@ static const struct boardtype boardtypes[] = {
.iorange = IORANGE_ICP_MULTI, .iorange = IORANGE_ICP_MULTI,
.have_irq = 1, .have_irq = 1,
.cardtype = TYPE_ICP_MULTI, .cardtype = TYPE_ICP_MULTI,
.ai_maxdata = 0x0fff,
.rangelist_ai = &range_analog, .rangelist_ai = &range_analog,
.rangecode = range_codes_analog, .rangecode = range_codes_analog,
.rangelist_ao = &range_analog, .rangelist_ao = &range_analog,