Skip to content

Commit

Permalink
Staging: comedi: Remove use of VOID typedef in addi-data
Browse files Browse the repository at this point in the history 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 63aa142 commit 3019b41
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 26 deletions.
1 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/addi-data/addi_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
26 changes: 13 additions & 13 deletions drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
+----------------------------------------------------------------------------+
Expand Down Expand Up @@ -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) |
Expand All @@ -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;
Expand Down Expand Up @@ -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) |
Expand All @@ -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)
{

/************************/
Expand Down Expand Up @@ -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, |
Expand Down Expand Up @@ -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)
{

Expand Down Expand Up @@ -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, |
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 |
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. |*/
/*+----------------------------------------------------------------------------+*/
Expand All @@ -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;
Expand Down

0 comments on commit 3019b41

Please sign in to comment.