dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

env: clean env_sf.c checkpatch and code style

Browse Source 
Cleanup the env_sf.c checkpatch warnings, errors and coding style.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Igor Grinberg
2011-11-07 01:14:08 +00:00
committed by Stefano Babic
parent dd2a233c94
commit eb58a7fc77
1 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/env_sf.c
View File

@@ -55,7 +55,7 @@ static ulong env_new_offset = CONFIG_ENV_OFFSET_REDUND;
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
char * env_name_spec = "SPI Flash"; char *env_name_spec = "SPI Flash";
static struct spi_flash *env_flash; static struct spi_flash *env_flash;
@@ -65,17 +65,13 @@ uchar env_get_char_spec(int index)
} }
#if defined(CONFIG_ENV_OFFSET_REDUND) #if defined(CONFIG_ENV_OFFSET_REDUND)
int saveenv(void) int saveenv(void)
{ {
env_t env_new; env_t env_new;
ssize_t len; ssize_t len;
char *res; char *res, *saved_buffer = NULL, flag = OBSOLETE_FLAG;
u32 saved_size, saved_offset; u32 saved_size, saved_offset, sector = 1;
char *saved_buffer = NULL;
u32 sector = 1;
int ret; int ret;
char flag = OBSOLETE_FLAG;
if (!env_flash) { if (!env_flash) {
env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@@ -145,21 +141,21 @@ int saveenv(void)
goto done; goto done;
} }
ret = spi_flash_write(env_flash, ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
env_offset + offsetof(env_t, flags),
sizeof(env_new.flags), &flag); sizeof(env_new.flags), &flag);
if (ret) if (ret)
goto done; goto done;
puts("done\n"); puts("done\n");
gd->env_valid = (gd->env_valid == 2 ? 1 : 2); gd->env_valid = gd->env_valid == 2 ? 1 : 2;
printf("Valid environment: %d\n", (int)gd->env_valid); printf("Valid environment: %d\n", (int)gd->env_valid);
done: done:
if (saved_buffer) if (saved_buffer)
free(saved_buffer); free(saved_buffer);
return ret; return ret;
} }
@@ -245,18 +241,14 @@ err_read:
out: out:
free(tmp_env1); free(tmp_env1);
free(tmp_env2); free(tmp_env2);
return;
} }
#else #else
int saveenv(void) int saveenv(void)
{ {
u32 saved_size, saved_offset; u32 saved_size, saved_offset, sector = 1;
char *saved_buffer = NULL; char *res, *saved_buffer = NULL;
u32 sector = 1;
int ret = 1; int ret = 1;
env_t env_new; env_t env_new;
char *res;
ssize_t len; ssize_t len;
if (!env_flash) { if (!env_flash) {
@@ -274,9 +266,9 @@ int saveenv(void)
saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE; saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE; saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
saved_buffer = malloc(saved_size); saved_buffer = malloc(saved_size);
if (!saved_buffer) { if (!saved_buffer)
goto done; goto done;
}
ret = spi_flash_read(env_flash, saved_offset, ret = spi_flash_read(env_flash, saved_offset,
saved_size, saved_buffer); saved_size, saved_buffer);
if (ret) if (ret)
@@ -322,6 +314,7 @@ int saveenv(void)
done: done:
if (saved_buffer) if (saved_buffer)
free(saved_buffer); free(saved_buffer);
return ret; return ret;
} }
@@ -345,7 +338,6 @@ void env_relocate_spec(void)
} }
ret = env_import(buf, 1); ret = env_import(buf, 1);
if (ret) if (ret)
gd->env_valid = 1; gd->env_valid = 1;
out: out: