From 3019b4106bf8c2658343a84361f4f1abb6280633 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Thu, 19 Mar 2009 18:00:47 -0400 Subject: [PATCH] Staging: comedi: Remove use of VOID typedef in addi-data Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- .../staging/comedi/drivers/addi-data/addi_common.h | 1 - .../staging/comedi/drivers/addi-data/addi_eeprom.c | 26 +++++++++++----------- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 6 ++--- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.h | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.h | 4 ++-- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 ++-- 10 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.h b/drivers/staging/comedi/drivers/addi-data/addi_common.h index b3ad58e..fb8e25d 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -37,7 +37,6 @@ #define SUCCESS 1 /* variable type definition */ -typedef void VOID, *PVOID; typedef char CHAR, *PCHAR; typedef const CHAR *PCSTR; typedef unsigned char BYTE, *PBYTE; diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index bf83af2..29026ab 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -148,12 +148,12 @@ INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress, /******************************************/ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, WORD w_EepromStartAddress); -VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); -VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); -VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); -VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, +void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); +void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); +void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); +void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, BYTE b_DataLengthInBits); -VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); +void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); /* +----------------------------------------------------------------------------+ @@ -357,7 +357,7 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, +----------------------------------------------------------------------------+ -| Function Name : VOID v_EepromWaitBusy | +| Function Name : void v_EepromWaitBusy | | (WORD w_PCIBoardEepromAddress) | @@ -381,7 +381,7 @@ WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, */ -VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) +void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) { BYTE b_EepromBusy = 0; @@ -421,7 +421,7 @@ VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) +---------------------------------------------------------------------------------+ -| Function Name : VOID v_EepromClock76(DWORD dw_Address, | +| Function Name : void v_EepromClock76(DWORD dw_Address, | | DWORD dw_RegisterValue) | @@ -447,7 +447,7 @@ VOID v_EepromWaitBusy(WORD w_PCIBoardEepromAddress) */ -VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue) +void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue) { /************************/ @@ -488,7 +488,7 @@ VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue) +---------------------------------------------------------------------------------+ -| Function Name : VOID v_EepromSendCommand76(DWORD dw_Address, | +| Function Name : void v_EepromSendCommand76(DWORD dw_Address, | | DWORD dw_EepromCommand, | @@ -518,7 +518,7 @@ VOID v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue) */ -VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, +void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, BYTE b_DataLengthInBits) { @@ -623,7 +623,7 @@ VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, +---------------------------------------------------------------------------------+ -| Function Name : VOID v_EepromCs76Read(DWORD dw_Address, | +| Function Name : void v_EepromCs76Read(DWORD dw_Address, | | WORD w_offset, | @@ -653,7 +653,7 @@ VOID v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, */ -VOID v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) +void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) { CHAR c_BitPos = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c index 510323d..3f8929c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c @@ -196,7 +196,7 @@ void i_ADDI_AttachPCI1710(struct comedi_device * dev) } int i_APCI1710_Reset(struct comedi_device * dev); -VOID v_APCI1710_Interrupt(int irq, void *d); +void v_APCI1710_Interrupt(int irq, void *d); //for 1710 int i_APCI1710_Reset(struct comedi_device * dev) @@ -233,7 +233,7 @@ int i_APCI1710_Reset(struct comedi_device * dev) /* +----------------------------------------------------------------------------+ -| Function's Name : __VOID__ v_APCI1710_InterruptFunction | +| Function's Name : __void__ v_APCI1710_InterruptFunction | | (BYTE b_Interrupt, __CPPARGS) | +----------------------------------------------------------------------------+ | Task : APCI-1710 interrupt function | @@ -247,7 +247,7 @@ int i_APCI1710_Reset(struct comedi_device * dev) +----------------------------------------------------------------------------+ */ -VOID v_APCI1710_Interrupt(int irq, void *d) +void v_APCI1710_Interrupt(int irq, void *d) { struct comedi_device *dev = d; BYTE b_ModuleCpt = 0; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c index 05ea078..32796ce 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c @@ -243,7 +243,7 @@ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device * dev, struct comedi_su | | +----------------------------------------------------------------------------+ */ -static VOID v_APCI1032_Interrupt(int irq, void *d) +static void v_APCI1032_Interrupt(int irq, void *d) { struct comedi_device *dev = d; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h index d45707f..659ef85 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h @@ -58,6 +58,6 @@ INT i_APCI1032_ReadMoreDigitalInput(struct comedi_device *dev, struct comedi_sub // Interrupt functions..... -static VOID v_APCI1032_Interrupt(int irq, void *d); +static void v_APCI1032_Interrupt(int irq, void *d); //Reset INT i_APCI1032_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c index c9035ce..2d6adcf 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c @@ -2576,7 +2576,7 @@ int i_APCI1500_ConfigureInterrupt(struct comedi_device * dev, struct comedi_subd | | +----------------------------------------------------------------------------+ */ -static VOID v_APCI1500_Interrupt(int irq, void *d) +static void v_APCI1500_Interrupt(int irq, void *d) { struct comedi_device *dev = d; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c index da69bee..a6b504c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c @@ -916,7 +916,7 @@ int i_APCI1564_ReadInterruptStatus(struct comedi_device * dev, struct comedi_sub | | +----------------------------------------------------------------------------+ */ -static VOID v_APCI1564_Interrupt(int irq, void *d) +static void v_APCI1564_Interrupt(int irq, void *d) { struct comedi_device *dev = d; UINT ui_DO, ui_DI; diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h index 2fbc8ce..f0c461c 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h @@ -113,7 +113,7 @@ int i_APCI1564_ReadTimerCounterWatchdog(struct comedi_device *dev, struct comedi_insn *insn, unsigned int *data); // INTERRUPT -static VOID v_APCI1564_Interrupt(int irq, void *d); +static void v_APCI1564_Interrupt(int irq, void *d); // RESET INT i_APCI1564_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h index b6a3a99..9261aac 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h @@ -63,8 +63,8 @@ int i_APCI2016_ReadWatchdog(struct comedi_device *dev, struct comedi_subdevice * // Interrupt functions..... -// VOID v_APCI2016_Interrupt(int irq, void *d) ; +// void v_APCI2016_Interrupt(int irq, void *d) ; - //VOID v_APCI2016_Interrupt(int irq, void *d); + //void v_APCI2016_Interrupt(int irq, void *d); // RESET INT i_APCI2016_Reset(struct comedi_device *dev); diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c index b4a9003..1ff66be 100644 --- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c +++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c @@ -247,7 +247,7 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead, } /*+----------------------------------------------------------------------------+*/ -/*| Function Name : VOID v_GetAPCI3200EepromCalibrationValue (VOID) |*/ +/*| Function Name : void v_GetAPCI3200EepromCalibrationValue (void) |*/ /*+----------------------------------------------------------------------------+*/ /*| Task : Read calibration value from the APCI-3200 eeprom. |*/ /*+----------------------------------------------------------------------------+*/ @@ -258,7 +258,7 @@ INT i_AddiHeaderRW_ReadEeprom(INT i_NbOfWordsToRead, /*| Return Value : - |*/ /*+----------------------------------------------------------------------------+*/ -VOID v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress, +void v_GetAPCI3200EepromCalibrationValue(DWORD dw_PCIBoardEepromAddress, str_BoardInfos * BoardInformations) { WORD w_AnalogInputMainHeaderAddress; -- 2.7.4