From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 23 Mar 2009 19:24:46 +0000 (-0700)
Subject: Staging: epl: remove CONST
X-Git-Tag: v2.6.30-rc1~202^2~62
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=5d9d5eb2bf0f31e41851c4cee01f7ba51dd11bf2;p=safe%2Fjmp%2Flinux-2.6

Staging: epl: remove CONST

Just make it const

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/EplObd.c b/drivers/staging/epl/EplObd.c
index 6d53e1c..f449f4c 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 6e0db9a..4e60143 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 31ea536..51c7409 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 ---