diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 18:16:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-09 16:29:04 -0700 |
| commit | 14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f (patch) | |
| tree | 3adda254a843c23deeb8be8157b934d9956c059f | |
| parent | 849d1ea4ae28e57557ad8901837d36aa2a760b5e (diff) | |
staging: comedi: rti800: remove adc_mux from private data
The 'adc_mux' 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/rti800.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index 2bc6e8e581e7..8fb8af044159 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_diff, adc_pseudodiff, adc_singleended - } adc_mux; - enum { adc_bipolar10, adc_bipolar5, adc_unipolar10 } adc_range; enum { @@ -316,7 +313,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -ENOMEM; dev->private = devpriv; - devpriv->adc_mux = it->options[2]; devpriv->adc_range = it->options[3]; devpriv->adc_coding = it->options[4]; devpriv->dac0_range = it->options[5]; @@ -333,7 +329,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) /* ai subdevice */ s->type = COMEDI_SUBD_AI; s->subdev_flags = SDF_READABLE | SDF_GROUND; - s->n_chan = (devpriv->adc_mux ? 16 : 8); + s->n_chan = (it->options[2] ? 16 : 8); s->insn_read = rti800_ai_insn_read; s->maxdata = 0xfff; switch (devpriv->adc_range) { |
