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>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index d6a91dbd7f622fd5b3caef930cb7e9253107ff11..2a741ff4196b09dd34f77cdd369e76edac7baf22 100644 (file)
--- 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,
        devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
        devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
        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.ui_MinAcquisitiontimeNs =
                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 b241ef3a7bfde2099d741a543575b3997e3e21b0..443b37e895b955eb8f87f0b0cb49b0bbeb2589c4 100644 (file)
--- 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 {
 
        int i_NbrTTLChannel;    /*  Number of TTL channels */
 
-       int i_Dma;              /*  dma present or not */
        int i_Timer;            /*    timer subdevice present or not */
        unsigned int ui_MinAcquisitiontimeNs;   /*  Minimum Acquisition in Nano secs */
        unsigned int ui_MinDelaytimeNs; /*  Minimum Delay in Nano secs */
@@ -336,7 +335,6 @@ struct addi_private {
                int i_NbrDiChannel;     /*  Number of DI channels */
                int i_NbrDoChannel;     /*  Number of DO channels */
                int i_DoMaxdata;        /*  data to set all channels high */
-               int i_Dma;              /*  dma present or not */
                int i_Timer;            /*  timer subdevice present or not */
                unsigned int ui_MinAcquisitiontimeNs;
                                        /*  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 a5fed63059ad1e2bd11f272556d1c957b38d51b8..dc031c494a27c184cd8590e00eac67774076ef53 100644 (file)
--- 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,
        devpriv->s_EeParameters.ui_MinDelaytimeNs = tmp * 1000;
 
        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;
        if (tmp) {              /* > 0 */