From: H Hartley Sweeten Date: Wed, 24 Jul 2013 18:11:51 +0000 (-0700) Subject: staging: comedi: addi_apci_1710: fix some compile errors/warnings X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=32d6d4e00b32c056fce8adf9d36a61f3c4d8fc87;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c index d0702084caa2..a979abfc9121 100644 --- 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 27de18e79895..7d1883a0da28 100644 --- 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 fb56360444ee..c01497a8a457 100644 --- 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 e600c05c2ecc..3035b2aa20cb 100644 --- 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));