From: Igor Grinberg <grinberg@compulab.co.il>
Date: Mon, 7 Nov 2011 01:14:04 +0000 (+0000)
Subject: env: clean env_nvram.c checkpatch and code style
X-Git-Tag: v2011.12-rc1~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91494ca6a04e9e8d66b88053f1f600ed5c2fa1e1;p=u-boot

env: clean env_nvram.c checkpatch and code style

Cleanup the env_nvram.c checkpatch warnings, errors and coding style.
There are 2 wanring left about the extern used in c file:
 WARNING: externs should be avoided in .c files
 #53: FILE: env_nvram.c:53:
 +extern void *nvram_read(void *dest, const long src, size_t count);

 WARNING: externs should be avoided in .c files
 #54: FILE: env_nvram.c:54:
 +extern void nvram_write(long dest, const void *src, size_t count);

 total: 0 errors, 2 warnings, 138 lines checked

There is no common nvram header file to use instead of the externs.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---

diff --git a/common/env_nvram.c b/common/env_nvram.c
index f32d06f1ca..726eaac55e 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -52,19 +52,19 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
-env_t *env_ptr = NULL;
+env_t *env_ptr;
 #else
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-char * env_name_spec = "NVRAM";
+char *env_name_spec = "NVRAM";
 
 uchar env_get_char_spec(int index)
 {
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 	uchar c;
 
-	nvram_read(&c, CONFIG_ENV_ADDR+index, 1);
+	nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
 
 	return c;
 #else
@@ -79,7 +79,7 @@ void env_relocate_spec(void)
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
 	nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #else
-	memcpy(buf, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
+	memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
 	env_import(buf, 1);
 }
@@ -108,7 +108,6 @@ int saveenv(void)
 	return rcode;
 }
 
-
 /*
  * Initialize Environment use
  *
@@ -121,18 +120,19 @@ int env_init(void)
 	uchar data[ENV_SIZE];
 
 	nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
-	nvram_read(data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE);
+	nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);
 
 	if (crc32(0, data, ENV_SIZE) == crc) {
-		gd->env_addr  = (ulong)CONFIG_ENV_ADDR + sizeof(long);
+		gd->env_addr	= (ulong)CONFIG_ENV_ADDR + sizeof(long);
 #else
 	if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
-		gd->env_addr  = (ulong)&(env_ptr->data);
+		gd->env_addr	= (ulong)&env_ptr->data;
 #endif
-		gd->env_valid = 1;
+		gd->env_valid	= 1;
 	} else {
-		gd->env_addr  = (ulong)&default_environment[0];
-		gd->env_valid = 0;
+		gd->env_addr	= (ulong)&default_environment[0];
+		gd->env_valid	= 0;
 	}
-	return (0);
+
+	return 0;
 }