From: H Hartley Sweeten Date: Tue, 4 Nov 2014 17:54:32 +0000 (-0700) Subject: staging: comedi: addi_apci_3120: remove private data 'ui_AiReadData' X-Git-Tag: firefly_0821_release~176^2~2665^2~307 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=22f75dac46e0691ef03e44d27d21d2b860cc15fe;p=firefly-linux-kernel-4.4.55.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- 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;