From 7ada80124c13ca8131a79106fb126c322cad0ec5 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:16:42 -0700 Subject: [PATCH] --- yaml --- r: 363999 b: refs/heads/master c: 14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f h: refs/heads/master i: 363997: 55897b8dcc5a854cfdc677ad19a2a928c0c489e9 363995: ef52962f7a3e96f6d87395e093cf3d0dcf41986d 363991: b0182b66240a6a1078e473aea3e56db814cdd72e 363983: 162911ba8166dc01729fa6c1291dddd63bcd109d 363967: d8f99b24c0caec6f59423e797b72e5c2b07e600b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ee69e2104c96..6afaf0118657 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 849d1ea4ae28e57557ad8901837d36aa2a760b5e +refs/heads/master: 14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index 2bc6e8e581e7..8fb8af044159 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/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) {