Staging: epl: remove GENERIC

It wasn't used and isn't needed.

Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/epl/Epl.h b/drivers/staging/epl/Epl.h
index 6e5910d1915d7394c1678c2c7ffdc0173a769af7..74038b7df2e764c56833692e2fc732582f681312 100644 (file)
--- 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 e174562ddf89b570b01c4e91e99e7088a62b4a59..58286fccfc20464be9e7f6817a66b712b4361535 100644 (file)
--- 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 8d4a218c3248133ddccddb61dae012007a2ab16b..52f8e1bd473f243bef6a043ebb3dc8542eab470d 100644 (file)
--- 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 25a44d961c00150b52f3d0f02a79d2e5fd3ffaf9..120e77e50894dbbc9a31e2118e1e1a043885aa59 100644 (file)
--- 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 6be30d6b4a280af9b36f3e59dbb35843b5a9003f..20787dc18b9ada4d88edf2c829194673e5c9b0c2 100644 (file)
--- 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 3a987db81cca6e8efe72ddc0967d1e137059d275..6214075704e277bfc3c717ef3782f80e56f04fd1 100644 (file)
--- 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