From 14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:16:42 -0700 Subject: [PATCH] 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 Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/rti800.c | 6 +----- 1 file changed, 1 insertion(+), 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 @@ -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) { -- 2.30.2