]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
staging: comedi: rti800: remove adc_mux from private data
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Apr 2013 01:16:42 +0000 (18:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2013 23:29:04 +0000 (16:29 -0700)
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>
drivers/staging/comedi/drivers/rti800.c

index 2bc6e8e581e79681c1313fc95904434b4a96ad96..8fb8af0441598ddb73c0a0abff8f873304ba8522 100644 (file)
@@ -139,9 +139,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;
@@ -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) {