aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-04-08 21:17:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-09 19:29:04 -0400
commit6605a305c56cb09362e11d93e74c6236eba19f9a (patch)
treed233db04d078b7192cce916b7b30123fba3d2ab2 /drivers/staging
parent14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f (diff)
staging: comedi: rti800: remove adc_range from private data
The 'adc_range' is only used in the attach of the board. Remove it from the private data. 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/rti800.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 8fb8af044159..583a4ed07b4c 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -140,9 +140,6 @@ static const struct rti800_board rti800_boardtypes[] = {
140 140
141struct rti800_private { 141struct rti800_private {
142 enum { 142 enum {
143 adc_bipolar10, adc_bipolar5, adc_unipolar10
144 } adc_range;
145 enum {
146 adc_2comp, adc_straight 143 adc_2comp, adc_straight
147 } adc_coding; 144 } adc_coding;
148 enum { 145 enum {
@@ -313,7 +310,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
313 return -ENOMEM; 310 return -ENOMEM;
314 dev->private = devpriv; 311 dev->private = devpriv;
315 312
316 devpriv->adc_range = it->options[3];
317 devpriv->adc_coding = it->options[4]; 313 devpriv->adc_coding = it->options[4];
318 devpriv->dac0_range = it->options[5]; 314 devpriv->dac0_range = it->options[5];
319 devpriv->dac0_coding = it->options[6]; 315 devpriv->dac0_coding = it->options[6];
@@ -332,14 +328,14 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
332 s->n_chan = (it->options[2] ? 16 : 8); 328 s->n_chan = (it->options[2] ? 16 : 8);
333 s->insn_read = rti800_ai_insn_read; 329 s->insn_read = rti800_ai_insn_read;
334 s->maxdata = 0xfff; 330 s->maxdata = 0xfff;
335 switch (devpriv->adc_range) { 331 switch (it->options[3]) {
336 case adc_bipolar10: 332 case 0:
337 s->range_table = &range_rti800_ai_10_bipolar; 333 s->range_table = &range_rti800_ai_10_bipolar;
338 break; 334 break;
339 case adc_bipolar5: 335 case 1:
340 s->range_table = &range_rti800_ai_5_bipolar; 336 s->range_table = &range_rti800_ai_5_bipolar;
341 break; 337 break;
342 case adc_unipolar10: 338 case 2:
343 s->range_table = &range_rti800_ai_unipolar; 339 s->range_table = &range_rti800_ai_unipolar;
344 break; 340 break;
345 } 341 }