aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <[email protected]>2014-11-04 10:54:32 -0700
committerGreg Kroah-Hartman <[email protected]>2014-11-07 09:34:01 -0800
commit22f75dac46e0691ef03e44d27d21d2b860cc15fe (patch)
treecae4e579f8d090fdda38751c8a525e60a0d6d32d
parente614d1710803e47549d2189927c3b25de856cfb2 (diff)
staging: comedi: addi_apci_3120: remove private data 'ui_AiReadData'
This member of the private data was used to return analog input samples that were acquired for the (*insn_read) using interrupts. The interrupt support code for the (*insn_read) has been removed. Remove this unused member from the private data. Signed-off-by: H Hartley Sweeten <[email protected]> Reviewed-by: Ian Abbott <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
-rw-r--r--drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c4
-rw-r--r--drivers/staging/comedi/drivers/addi_apci_3120.c1
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 5d15acacc259..51cdecb211d6 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -147,7 +147,7 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
struct apci3120_private *devpriv = dev->private;
unsigned int divisor;
unsigned int ns;
- unsigned short us_TmpValue, i;
+ unsigned short us_TmpValue;
/* fix conversion time to 10 us */
ns = 10000;
@@ -157,8 +157,6 @@ static int apci3120_ai_insn_read(struct comedi_device *dev,
devpriv->mode = 0;
if (insn->unused[0] == 222) { /* second insn read */
- for (i = 0; i < insn->n; i++)
- data[i] = devpriv->ui_AiReadData[i];
} else {
devpriv->tsk_Current = current; /* Save the current process task structure */
diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 572d545e7492..dc05b2f616ca 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -115,7 +115,6 @@ struct apci3120_private {
unsigned int osc_base;
unsigned int ui_AiNbrofChannels;
unsigned int ui_AiChannelList[32];
- unsigned int ui_AiReadData[32];
unsigned short us_UseDma;
unsigned char b_DmaDoubleBuffer;
unsigned int ui_DmaActualBuffer;