shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-02 01:06:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: rti800: remove dac[01]_range from private data

Browse Source 
The 'dac[01]_range' 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>
This commit is contained in:
H Hartley Sweeten
2013-04-08 18:17:22 -07:00
committed by Greg Kroah-Hartman
parent 6605a305c5
commit 7ae8de37fe
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/comedi/drivers/rti800.c
View File

@@ -142,9 +142,6 @@ struct rti800_private {
enum {
adc_2comp, adc_straight
} adc_coding;
enum {
dac_bipolar10, dac_unipolar10
} dac0_range, dac1_range;
enum {
dac_2comp, dac_straight
} dac0_coding, dac1_coding;
@@ -311,9 +308,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev->private = devpriv;
devpriv->adc_coding = it->options[4];
devpriv->dac0_range = it->options[5];
devpriv->dac0_coding = it->options[6];
devpriv->dac1_range = it->options[7];
devpriv->dac1_coding = it->options[8];
devpriv->muxgain_bits = -1;
@@ -350,19 +345,19 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_write = rti800_ao_insn_write;
s->maxdata = 0xfff;
s->range_table_list = devpriv->ao_range_type_list;
switch (devpriv->dac0_range) {
case dac_bipolar10:
switch (it->options[5]) {
case 0:
devpriv->ao_range_type_list[0] = &range_bipolar10;
break;
case dac_unipolar10:
case 1:
devpriv->ao_range_type_list[0] = &range_unipolar10;
break;
}
switch (devpriv->dac1_range) {
case dac_bipolar10:
switch (it->options[7]) {
case 0:
devpriv->ao_range_type_list[1] = &range_bipolar10;
break;
case dac_unipolar10:
case 1:
devpriv->ao_range_type_list[1] = &range_unipolar10;
break;
}