From 5d9d5eb2bf0f31e41851c4cee01f7ba51dd11bf2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Mar 2009 12:24:46 -0700 Subject: [PATCH] Staging: epl: remove CONST Just make it const Cc: Daniel Krueger Cc: Ronald Sieber Signed-off-by: Greg Kroah-Hartman --- drivers/staging/epl/EplObd.c | 12 ++++-------- drivers/staging/epl/demo_main.c | 2 +- drivers/staging/epl/global.h | 4 ---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/epl/EplObd.c b/drivers/staging/epl/EplObd.c index 6d53e1ca83bc..f449f4c30a7a 100644 --- a/drivers/staging/epl/EplObd.c +++ b/drivers/staging/epl/EplObd.c @@ -2185,12 +2185,10 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void *)pData != (CONST void *)NULL) { + if ((const void *)pData != (const void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. - DataSize = - ((CONST tEplObdVString *) pData)-> - m_Size; + DataSize = ((const tEplObdVString *)pData)->m_Size; } } @@ -2209,12 +2207,10 @@ static tEplObdSize EplObdGetObjectSize(tEplObdSubEntryPtr pSubIndexEntry_p) // The current position is not decleared. The string // is located in ROM, therefor use default pointer. pData = (void *)pSubIndexEntry_p->m_pDefault; - if ((CONST void *)pData != (CONST void *)NULL) { + if ((const void *)pData != (const void *)NULL) { // The max. size of strings defined by STRING-Macro is stored in // tEplObdVString of default value. - DataSize = - ((CONST tEplObdOString *) pData)-> - m_Size; + DataSize = ((const tEplObdOString *)pData)->m_Size; } } break; diff --git a/drivers/staging/epl/demo_main.c b/drivers/staging/epl/demo_main.c index 6e0db9a25fe9..4e60143a5b08 100644 --- a/drivers/staging/epl/demo_main.c +++ b/drivers/staging/epl/demo_main.c @@ -148,7 +148,7 @@ void TgtDbgSignalTracePoint(BYTE bTracePointNumber_p); // modul globale vars //--------------------------------------------------------------------------- -CONST BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +const BYTE abMacAddr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; BYTE bVarIn1_l; BYTE bVarOut1_l; diff --git a/drivers/staging/epl/global.h b/drivers/staging/epl/global.h index 31ea536e48b9..51c7409828f7 100644 --- a/drivers/staging/epl/global.h +++ b/drivers/staging/epl/global.h @@ -27,10 +27,6 @@ #define QWORD long long int #endif -#ifndef CONST -#define CONST const // variables mapped to ROM (i.e. flash) -#endif - #define TRACE printk // --- logic types --- -- 2.20.1