From bd3966d5dc109a7f5cfcd7e14a851acc18d69324 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 11:37:22 -0700 Subject: [PATCH] Staging: epl: remove GENERIC It wasn't used and isn't needed. Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/Epl.h | 2 +- drivers/staging/epl/EplApiGeneric.c | 8 ++++---- drivers/staging/epl/EplApiLinuxKernel.c | 4 ++-- drivers/staging/epl/EplErrorHandlerk.c | 2 +- drivers/staging/epl/demo_main.c | 4 ++-- drivers/staging/epl/global.h | 5 ----- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h index 6e5910d1915d..74038b7df2e7 100644 --- a/drivers/staging/epl/Epl.h +++ b/drivers/staging/epl/Epl.h @@ -133,7 +133,7 @@ typedef union { typedef tEplKernel(ROM *tEplApiCbEvent) (tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); typedef struct { unsigned int m_uiSizeOfStruct; diff --git a/drivers/staging/epl/EplApiGeneric.c b/drivers/staging/epl/EplApiGeneric.c index e174562ddf89..58286fccfc20 100644 --- a/drivers/staging/epl/EplApiGeneric.c +++ b/drivers/staging/epl/EplApiGeneric.c @@ -588,7 +588,7 @@ tEplKernel EplApiLinkObject(unsigned int uiObjIndex_p, EntrySize = (tEplObdSize) sizeof(bIndexEntries); RetCode = EplObdReadEntry(uiObjIndex_p, 0x00, - (void GENERIC *)&bIndexEntries, + (void *)&bIndexEntries, &EntrySize); if ((RetCode != kEplSuccessful) || (bIndexEntries == 0x00)) { @@ -1839,7 +1839,7 @@ static tEplKernel EplApiUpdateObd(void) // write Device Name (0x1008) Ret = EplObdWriteEntry(0x1008, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszDevName, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. @@ -1854,7 +1854,7 @@ static tEplKernel EplApiUpdateObd(void) // write Hardware version (0x1009) Ret = EplObdWriteEntry(0x1009, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszHwVersion, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. @@ -1869,7 +1869,7 @@ static tEplKernel EplApiUpdateObd(void) // write Software version (0x100A) Ret = EplObdWriteEntry(0x100A, 0, - (void GENERIC *)EplApiInstance_g. + (void *)EplApiInstance_g. m_InitParam.m_pszSwVersion, (tEplObdSize) strlen(EplApiInstance_g. m_InitParam. diff --git a/drivers/staging/epl/EplApiLinuxKernel.c b/drivers/staging/epl/EplApiLinuxKernel.c index 8d4a218c3248..52f8e1bd473f 100644 --- a/drivers/staging/epl/EplApiLinuxKernel.c +++ b/drivers/staging/epl/EplApiLinuxKernel.c @@ -206,7 +206,7 @@ typedef struct { tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); tEplKernel EplLinCbSync(void); @@ -1160,7 +1160,7 @@ static int EplLinIoctl(struct inode *pDeviceFile_p, // information about the dev tEplKernel EplLinCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p) + void *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; int iErr; diff --git a/drivers/staging/epl/EplErrorHandlerk.c b/drivers/staging/epl/EplErrorHandlerk.c index 25a44d961c00..120e77e50894 100644 --- a/drivers/staging/epl/EplErrorHandlerk.c +++ b/drivers/staging/epl/EplErrorHandlerk.c @@ -774,7 +774,7 @@ static tEplKernel EplErrorHandlerkLinkArray(DWORD * pdwValue_p, EntrySize = (tEplObdSize) sizeof(bIndexEntries); Ret = EplObdReadEntry(uiIndex_p, - 0x00, (void GENERIC *)&bIndexEntries, &EntrySize); + 0x00, (void *)&bIndexEntries, &EntrySize); if ((Ret != kEplSuccessful) || (bIndexEntries == 0x00)) { // Object doesn't exist or invalid entry number diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 6be30d6b4a28..20787dc18b9a 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -192,7 +192,7 @@ tEplKernel EplObdInitRam(tEplObdInitParam MEM * pInitParam_p); tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p); + void *pUserArg_p); tEplKernel AppCbSync(void); @@ -486,7 +486,7 @@ static void __exit EplLinExit(void) tEplKernel AppCbEvent(tEplApiEventType EventType_p, // IN: event type (enum) tEplApiEventArg *pEventArg_p, // IN: event argument (union) - void GENERIC *pUserArg_p) + void *pUserArg_p) { tEplKernel EplRet = kEplSuccessful; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 3a987db81cca..6214075704e2 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -33,11 +33,6 @@ // usage: CONST BYTE ROM foo = 0x00; #define HWACC // hardware access through external memory (i.e. CAN) - // These types can be adjusted by users to match application requirements. The goal is to - // minimize code memory and maximize speed. -#define GENERIC // generic pointer to point to application data - // Variables with this attribute can be located in external - // or internal data memory. #define MEM // Memory attribute to optimize speed and code of pointer access. #ifndef NEAR -- 2.30.2