Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3019b410 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove use of VOID typedef in addi-data 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 63aa142a

drivers/staging/comedi/drivers/addi-data/addi_common.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi-data/addi_eeprom.c

+13 −13
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h

+1 −1
Original line number Diff line number Diff line
@@ -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);