aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-06-18 15:15:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-19 12:45:56 -0400
commit41a3999eb003c2cfe8d953961b49258176aea0ad (patch)
tree5a9a7959049ae720c27403e3d21d26257dddb22a
parentb34e3ca28eeb20f6fc8191b0e7a0cf7466d08157 (diff)
staging: comedi: addi-data: remove unused 'i_Dma' present flag
None of the addi-data drivers that still use the "common" code support dma. Remove the unnecessaary boardinfo and private data flags. 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>
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.c1
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_common.h2
-rw-r--r--drivers/staging/comedi/drivers/addi-data/addi_eeprom.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index d6a91dbd7f62..2a741ff4196b 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -116,7 +116,6 @@ static int addi_auto_attach(struct comedi_device *dev,
116 devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel; 116 devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
117 devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel; 117 devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
118 devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata; 118 devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;
119 devpriv->s_EeParameters.i_Dma = this_board->i_Dma;
120 devpriv->s_EeParameters.i_Timer = this_board->i_Timer; 119 devpriv->s_EeParameters.i_Timer = this_board->i_Timer;
121 devpriv->s_EeParameters.ui_MinAcquisitiontimeNs = 120 devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
122 this_board->ui_MinAcquisitiontimeNs; 121 this_board->ui_MinAcquisitiontimeNs;
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index b241ef3a7bfd..443b37e895b9 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -56,7 +56,6 @@ struct addi_board {
56 56
57 int i_NbrTTLChannel; /* Number of TTL channels */ 57 int i_NbrTTLChannel; /* Number of TTL channels */
58 58
59 int i_Dma; /* dma present or not */
60 int i_Timer; /* timer subdevice present or not */ 59 int i_Timer; /* timer subdevice present or not */
61 unsigned int ui_MinAcquisitiontimeNs; /* Minimum Acquisition in Nano secs */ 60 unsigned int ui_MinAcquisitiontimeNs; /* Minimum Acquisition in Nano secs */
62 unsigned int ui_MinDelaytimeNs; /* Minimum Delay in Nano secs */ 61 unsigned int ui_MinDelaytimeNs; /* Minimum Delay in Nano secs */
@@ -336,7 +335,6 @@ struct addi_private {
336 int i_NbrDiChannel; /* Number of DI channels */ 335 int i_NbrDiChannel; /* Number of DI channels */
337 int i_NbrDoChannel; /* Number of DO channels */ 336 int i_NbrDoChannel; /* Number of DO channels */
338 int i_DoMaxdata; /* data to set all channels high */ 337 int i_DoMaxdata; /* data to set all channels high */
339 int i_Dma; /* dma present or not */
340 int i_Timer; /* timer subdevice present or not */ 338 int i_Timer; /* timer subdevice present or not */
341 unsigned int ui_MinAcquisitiontimeNs; 339 unsigned int ui_MinAcquisitiontimeNs;
342 /* Minimum Acquisition in Nano secs */ 340 /* Minimum Acquisition in Nano secs */
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index a5fed63059ad..dc031c494a27 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -295,7 +295,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
295 devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000; 295 devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000;
296 296
297 tmp = addi_eeprom_readw(iobase, type, addr + 20); 297 tmp = addi_eeprom_readw(iobase, type, addr + 20);
298 devpriv->s_EeParameters.i_Dma = (tmp >> 13) & 0x01; 298 /* dma = (tmp >> 13) & 0x01; */
299 299
300 tmp = addi_eeprom_readw(iobase, type, addr + 72) & 0xff; 300 tmp = addi_eeprom_readw(iobase, type, addr + 72) & 0xff;
301 if (tmp) { /* > 0 */ 301 if (tmp) { /* > 0 */