From 6605a305c56cb09362e11d93e74c6236eba19f9a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:17:01 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/rti800.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index 8fb8af0..583a4ed 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[] = { struct rti800_private { enum { - adc_bipolar10, adc_bipolar5, adc_unipolar10 - } adc_range; - enum { adc_2comp, adc_straight } adc_coding; enum { @@ -313,7 +310,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -ENOMEM; dev->private = devpriv; - devpriv->adc_range = it->options[3]; devpriv->adc_coding = it->options[4]; devpriv->dac0_range = it->options[5]; devpriv->dac0_coding = it->options[6]; @@ -332,14 +328,14 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->n_chan = (it->options[2] ? 16 : 8); s->insn_read = rti800_ai_insn_read; s->maxdata = 0xfff; - switch (devpriv->adc_range) { - case adc_bipolar10: + switch (it->options[3]) { + case 0: s->range_table = &range_rti800_ai_10_bipolar; break; - case adc_bipolar5: + case 1: s->range_table = &range_rti800_ai_5_bipolar; break; - case adc_unipolar10: + case 2: s->range_table = &range_rti800_ai_unipolar; break; } -- 2.7.4