staging: comedi: addi-data: remove 'b_ValidDriver' from the private data

This variable is only used in the detach of the addi-data boards to
indicate that the attach of the board was successful and that the reset
function can be called. We can use the dev->iobase variable to indicate
this instead. Once this variable is set the attach always completes.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: 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 02d1015f3b992f7cbd419d88276fee385a5be876..b533c23ca247bb2c31c1c000c096e8fdf31127ba 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -367,7 +367,6 @@ static int addi_attach_pci(struct comedi_device *dev,
        }
 
        i_ADDI_Reset(dev);
-       devpriv->b_ValidDriver = 1;
        return 0;
 }
 
@@ -378,7 +377,7 @@ static void i_ADDI_Detach(struct comedi_device *dev)
        struct addi_private *devpriv = dev->private;
 
        if (devpriv) {
-               if (devpriv->b_ValidDriver)
+               if (dev->iobase)
                        i_ADDI_Reset(dev);
                if (dev->irq)
                        free_irq(dev->irq, dev);

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 2773359e54e35869dccee38676128082259fa13a..97760cc73f1c1ed33e80557321e2c66ac88a4812 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -312,7 +312,6 @@ struct addi_private {
        int i_IobaseAddon;      /* addon base address */
        int i_IobaseReserved;
        void __iomem *dw_AiBase;
-       unsigned char b_ValidDriver;    /*  driver is ok */
        unsigned char b_AiContinuous;   /*  we do unlimited AI */
        unsigned char b_AiInitialisation;
        unsigned int ui_AiActualScan;   /* how many scans we finished */