aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-05-29 13:30:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-18 17:39:37 -0400
commit301b1ffcbe8f4282e1717fdf21f3fefce94cda7e (patch)
treebf0aa0303dc99a1efc7ef01787bbdbe34fb8a120 /drivers
parent5a07983d8d0ccef2eb30ae972b55b71dc540706a (diff)
staging: comedi: addi_common.h: remove 'b_SingleDiff' from private data
This member is set but never used. Just remove it. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.c10
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.h1
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3120.c7
3 files changed, 5 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index dc87df032203..de5843ab01ae 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -157,14 +157,10 @@ static int addi_auto_attach(struct comedi_device *dev,
157 s->subdev_flags = 157 s->subdev_flags =
158 SDF_READABLE | SDF_COMMON | SDF_GROUND 158 SDF_READABLE | SDF_COMMON | SDF_GROUND
159 | SDF_DIFF; 159 | SDF_DIFF;
160 if (devpriv->s_EeParameters.i_NbrAiChannel) { 160 if (devpriv->s_EeParameters.i_NbrAiChannel)
161 s->n_chan = 161 s->n_chan = devpriv->s_EeParameters.i_NbrAiChannel;
162 devpriv->s_EeParameters.i_NbrAiChannel; 162 else
163 devpriv->b_SingelDiff = 0;
164 } else {
165 s->n_chan = this_board->i_NbrAiChannelDiff; 163 s->n_chan = this_board->i_NbrAiChannelDiff;
166 devpriv->b_SingelDiff = 1;
167 }
168 s->maxdata = devpriv->s_EeParameters.i_AiMaxdata; 164 s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
169 s->len_chanlist = this_board->i_AiChannelList; 165 s->len_chanlist = this_board->i_AiChannelList;
170 s->range_table = this_board->pr_AiRangelist; 166 s->range_table = this_board->pr_AiRangelist;
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 5c6a11c35ded..080bb6b2edcc 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -141,7 +141,6 @@ struct addi_private {
141 unsigned char b_InterruptMode; /* eoc eos or dma */ 141 unsigned char b_InterruptMode; /* eoc eos or dma */
142 unsigned char b_EocEosInterrupt; /* Enable disable eoc eos interrupt */ 142 unsigned char b_EocEosInterrupt; /* Enable disable eoc eos interrupt */
143 unsigned int ui_EocEosConversionTime; 143 unsigned int ui_EocEosConversionTime;
144 unsigned char b_SingelDiff;
145 unsigned char b_ExttrigEnable; /* To enable or disable external trigger */ 144 unsigned char b_ExttrigEnable; /* To enable or disable external trigger */
146 145
147 /* Pointer to the current process */ 146 /* Pointer to the current process */
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 0cfb12fa1cbc..cc4f586ba20d 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -125,13 +125,10 @@ static int apci3120_auto_attach(struct comedi_device *dev,
125 s->subdev_flags = 125 s->subdev_flags =
126 SDF_READABLE | SDF_COMMON | SDF_GROUND 126 SDF_READABLE | SDF_COMMON | SDF_GROUND
127 | SDF_DIFF; 127 | SDF_DIFF;
128 if (this_board->i_NbrAiChannel) { 128 if (this_board->i_NbrAiChannel)
129 s->n_chan = this_board->i_NbrAiChannel; 129 s->n_chan = this_board->i_NbrAiChannel;
130 devpriv->b_SingelDiff = 0; 130 else
131 } else {
132 s->n_chan = this_board->i_NbrAiChannelDiff; 131 s->n_chan = this_board->i_NbrAiChannelDiff;
133 devpriv->b_SingelDiff = 1;
134 }
135 s->maxdata = this_board->i_AiMaxdata; 132 s->maxdata = this_board->i_AiMaxdata;
136 s->len_chanlist = this_board->i_AiChannelList; 133 s->len_chanlist = this_board->i_AiChannelList;
137 s->range_table = &range_apci3120_ai; 134 s->range_table = &range_apci3120_ai;