From: H Hartley Sweeten Date: Tue, 11 Sep 2012 20:47:36 +0000 (-0700) Subject: staging: comedi: icp_multi: remove ai_maxdata from boardinfo X-Git-Tag: v3.7-rc1~173^2~321 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=efac035ca6eaaf6ca353e730055022cdf03ae7bb;p=~emulex%2Finfiniband.git 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 3a28f914538..ef2359f148d 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -130,7 +130,6 @@ struct boardtype { int iorange; /* I/O range len */ char have_irq; /* 1=card support IRQ */ char cardtype; /* 0=ICP Multi */ - int ai_maxdata; /* resolution of A/D */ const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */ const char *rangecode; /* range codes for programming */ 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->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND | SDF_DIFF; s->n_chan = 16; - s->maxdata = this_board->ai_maxdata; + s->maxdata = 0x0fff; s->len_chanlist = 16; s->range_table = this_board->rangelist_ai; s->insn_read = icp_multi_insn_read_ai; @@ -882,7 +881,6 @@ static const struct boardtype boardtypes[] = { .iorange = IORANGE_ICP_MULTI, .have_irq = 1, .cardtype = TYPE_ICP_MULTI, - .ai_maxdata = 0x0fff, .rangelist_ai = &range_analog, .rangecode = range_codes_analog, .rangelist_ao = &range_analog,