[PATCH 048/108] staging: comedi: addi_apci_3120: remove private data 'ui_AiReadData'
H Hartley Sweeten
hsweeten at visionengravers.com
Tue Nov 4 17:54:32 UTC 2014
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 <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c | 4 +---
drivers/staging/comedi/drivers/addi_apci_3120.c | 1 -
2 files changed, 1 insertion(+), 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 5d15aca..51cdecb 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 572d545..dc05b2f 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;
--
2.0.3
More information about the devel
mailing list