Commit 41a3999e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b34e3ca2
...@@ -116,7 +116,6 @@ static int addi_auto_attach(struct comedi_device *dev, ...@@ -116,7 +116,6 @@ static int addi_auto_attach(struct comedi_device *dev,
devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel; devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel; devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata; devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;
devpriv->s_EeParameters.i_Dma = this_board->i_Dma;
devpriv->s_EeParameters.i_Timer = this_board->i_Timer; devpriv->s_EeParameters.i_Timer = this_board->i_Timer;
devpriv->s_EeParameters.ui_MinAcquisitiontimeNs = devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
this_board->ui_MinAcquisitiontimeNs; this_board->ui_MinAcquisitiontimeNs;
......
...@@ -56,7 +56,6 @@ struct addi_board { ...@@ -56,7 +56,6 @@ struct addi_board {
int i_NbrTTLChannel; /* Number of TTL channels */ int i_NbrTTLChannel; /* Number of TTL channels */
int i_Dma; /* dma present or not */
int i_Timer; /* timer subdevice present or not */ int i_Timer; /* timer subdevice present or not */
unsigned int ui_MinAcquisitiontimeNs; /* Minimum Acquisition in Nano secs */ unsigned int ui_MinAcquisitiontimeNs; /* Minimum Acquisition in Nano secs */
unsigned int ui_MinDelaytimeNs; /* Minimum Delay in Nano secs */ unsigned int ui_MinDelaytimeNs; /* Minimum Delay in Nano secs */
...@@ -336,7 +335,6 @@ struct addi_private { ...@@ -336,7 +335,6 @@ struct addi_private {
int i_NbrDiChannel; /* Number of DI channels */ int i_NbrDiChannel; /* Number of DI channels */
int i_NbrDoChannel; /* Number of DO channels */ int i_NbrDoChannel; /* Number of DO channels */
int i_DoMaxdata; /* data to set all channels high */ int i_DoMaxdata; /* data to set all channels high */
int i_Dma; /* dma present or not */
int i_Timer; /* timer subdevice present or not */ int i_Timer; /* timer subdevice present or not */
unsigned int ui_MinAcquisitiontimeNs; unsigned int ui_MinAcquisitiontimeNs;
/* Minimum Acquisition in Nano secs */ /* Minimum Acquisition in Nano secs */
......
...@@ -295,7 +295,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev, ...@@ -295,7 +295,7 @@ static void addi_eeprom_read_ai_info(struct comedi_device *dev,
devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000; devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000;
tmp = addi_eeprom_readw(iobase, type, addr + 20); tmp = addi_eeprom_readw(iobase, type, addr + 20);
devpriv->s_EeParameters.i_Dma = (tmp >> 13) & 0x01; /* dma = (tmp >> 13) & 0x01; */
tmp = addi_eeprom_readw(iobase, type, addr + 72) & 0xff; tmp = addi_eeprom_readw(iobase, type, addr + 72) & 0xff;
if (tmp) { /* > 0 */ if (tmp) { /* > 0 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment