From bc778ef526ed4daa027368cc5d8b8ad893b3af0c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 28 May 2014 16:34:50 -0700 Subject: [PATCH] staging: comedi: adq12b: remove 'differential' from private data This member of the private data is only used during the attach to determine if there are 8 differential or 16 single-ended analog inputs. Remove the member and use the comedi_devconfig option directly. Also, fix the subdev_flags when differential analog inputs are used. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/adq12b.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c index 40e91d7..6700320 100644 --- a/drivers/staging/comedi/drivers/adq12b.c +++ b/drivers/staging/comedi/drivers/adq12b.c @@ -114,7 +114,6 @@ static const struct comedi_lrange range_adq12b_ai_unipolar = { }; struct adq12b_private { - int differential; /* option 3 of comedi_config */ unsigned int last_ctreg; }; @@ -217,7 +216,6 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (!devpriv) return -ENOMEM; - devpriv->differential = it->options[2]; devpriv->last_ctreg = -1; /* force ctreg update */ ret = comedi_alloc_subdevices(dev, 3); @@ -227,8 +225,8 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) s = &dev->subdevices[0]; /* analog input subdevice */ s->type = COMEDI_SUBD_AI; - if (devpriv->differential) { - s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_DIFF; + if (it->options[2]) { + s->subdev_flags = SDF_READABLE | SDF_DIFF; s->n_chan = 8; } else { s->subdev_flags = SDF_READABLE | SDF_GROUND; -- 2.7.4