UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: adq12b: remove 'unipolar' from private data 

This member of the private data is only used during the attach to
determine which range table to use for the analog inputs. Remove
the member and use the comedi_devconfig option directly.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-05-28 16:34:49 -07:00 committed by Greg Kroah-Hartman
parent d8dc10bf68
commit 16b4775006
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/adq12b.c
View File

@ -114,7 +114,6 @@ static const struct comedi_lrange range_adq12b_ai_unipolar = {
};
struct adq12b_private {
int unipolar; /* option 2 of comedi_config (1 is iobase) */
int differential; /* option 3 of comedi_config */
unsigned int last_ctreg;
};
@ -218,7 +217,6 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!devpriv)
return -ENOMEM;
devpriv->unipolar = it->options[1];
devpriv->differential = it->options[2];
devpriv->last_ctreg = -1; /* force ctreg update */
@ -237,10 +235,8 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->n_chan = 16;
}
if (devpriv->unipolar)
s->range_table = &range_adq12b_ai_unipolar;
else
s->range_table = &range_adq12b_ai_bipolar;
s->range_table = it->options[1] ? &range_adq12b_ai_unipolar
: &range_adq12b_ai_bipolar;
s->maxdata = 0xfff;