staging: comedi: addi_apci_1710: fix some compile errors/warnings

Fix a couple comments within comments errors.

Remove the #include of eddi_eeprom.c. This driver does not use it.

Remove an unused local variable.

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/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
index d0702084caa281a5f0bf5c0c912f7c93f9ae460b..a979abfc91218cbfe3bdc045c650c752ec3ac337 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c
@@ -444,7 +444,7 @@ int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct come
 i_ReturnValue=insn->n;
        b_ModulNbr        = (unsigned char) CR_AREF(insn->chanspec);
        b_TimerNbr                = (unsigned char) CR_CHAN(insn->chanspec);
-       b_ActionType      = (unsigned char) data[0]; /*  enable disable */
+       b_ActionType      = (unsigned char) data[0]; enable disable
 +----------------------------------------------------------------------------+
 | Output Parameters : -                                                      |
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
index 27de18e79895680a6d8356f357efaefcc458d24c..7d1883a0da28659a444b11ea7a1d55ed6637309c 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c
@@ -653,7 +653,7 @@ static int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
                                         * s_BoardInfos. ui_Address + (64 * b_ModulNbr),
                                         * dw_WriteValue);
                                         */
-*/
+
                                        outl(dw_WriteValue,
                                                devpriv->s_BoardInfos.
                                                ui_Address + (64 * b_ModulNbr));

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
index fb56360444ee7b4f7308854129db2a6806992768..c01497a8a457c1e6a4bb537e5a11d65e74207166 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.c
@@ -814,7 +814,7 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi
 
   b_ModulNbr      = CR_AREF(insn->chanspec);
        b_OutputChannel= CR_CHAN(insn->chanspec);
-       ui_State           = data[0]; /*  ON or OFF */
+       ui_State           = data[0]; ON or OFF
 +----------------------------------------------------------------------------+
 | Output Parameters : -                                                      |
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index e600c05c2eccae8c0b24f5b97229a8b4fdc50ea6..3035b2aa20cb98e48fa925451f5ae4283866029b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -19,7 +19,6 @@ static void fpu_end(void)
        kernel_fpu_end();
 }
 
-#include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_APCI1710.c"
 
 static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
@@ -33,7 +32,6 @@ static int apci1710_auto_attach(struct comedi_device *dev,
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
        struct addi_private *devpriv;
-       struct comedi_subdevice *s;
        int ret;
 
        devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));