Commit 32d6d4e0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: 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 a2ec3dd3
...@@ -444,7 +444,7 @@ int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct come ...@@ -444,7 +444,7 @@ int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct come
i_ReturnValue=insn->n; i_ReturnValue=insn->n;
b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec); b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
b_TimerNbr = (unsigned char) CR_CHAN(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 : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
......
...@@ -653,7 +653,7 @@ static int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev, ...@@ -653,7 +653,7 @@ static int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device *dev,
* s_BoardInfos. ui_Address + (64 * b_ModulNbr), * s_BoardInfos. ui_Address + (64 * b_ModulNbr),
* dw_WriteValue); * dw_WriteValue);
*/ */
*/
outl(dw_WriteValue, outl(dw_WriteValue,
devpriv->s_BoardInfos. devpriv->s_BoardInfos.
ui_Address + (64 * b_ModulNbr)); ui_Address + (64 * b_ModulNbr));
......
...@@ -814,7 +814,7 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi ...@@ -814,7 +814,7 @@ int i_APCI1710_InsnWriteSetTTLIOChlOnOff(struct comedi_device *dev,struct comedi
b_ModulNbr = CR_AREF(insn->chanspec); b_ModulNbr = CR_AREF(insn->chanspec);
b_OutputChannel= CR_CHAN(insn->chanspec); b_OutputChannel= CR_CHAN(insn->chanspec);
ui_State = data[0]; /* ON or OFF */ ui_State = data[0]; ON or OFF
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
......
...@@ -19,7 +19,6 @@ static void fpu_end(void) ...@@ -19,7 +19,6 @@ static void fpu_end(void)
kernel_fpu_end(); kernel_fpu_end();
} }
#include "addi-data/addi_eeprom.c"
#include "addi-data/hwdrv_APCI1710.c" #include "addi-data/hwdrv_APCI1710.c"
static irqreturn_t v_ADDI_Interrupt(int irq, void *d) static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
...@@ -33,7 +32,6 @@ static int apci1710_auto_attach(struct comedi_device *dev, ...@@ -33,7 +32,6 @@ static int apci1710_auto_attach(struct comedi_device *dev,
{ {
struct pci_dev *pcidev = comedi_to_pci_dev(dev); struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct addi_private *devpriv; struct addi_private *devpriv;
struct comedi_subdevice *s;
int ret; int ret;
devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv));
......
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