GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

env: checkpatch clean env_fat

Browse source 
env_fat has several checkpatch warnings - clean those up.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
Igor Grinberg 2012-09-23 05:25:21 +00:00 • committed by Tom Rini
parent 3bb89e5bd5
commit 9aa90c1df0
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/env_fat.c
View file

@ -58,6 +58,7 @@ int saveenv(void)
block_dev_desc_t *dev_desc = NULL; block_dev_desc_t *dev_desc = NULL;
int dev = FAT_ENV_DEVICE; int dev = FAT_ENV_DEVICE;
int part = FAT_ENV_PART; int part = FAT_ENV_PART;
int err;
res = (char *)&env_new.data; res = (char *)&env_new.data;
len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL); len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
@ -67,7 +68,7 @@ int saveenv(void)
} }
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
if (strcmp (FAT_ENV_INTERFACE, "mmc") == 0) { if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
struct mmc *mmc = find_mmc_device(dev); struct mmc *mmc = find_mmc_device(dev);
if (!mmc) { if (!mmc) {
@ -86,14 +87,17 @@ int saveenv(void)
FAT_ENV_INTERFACE, dev); FAT_ENV_INTERFACE, dev);
return 1; return 1;
} }
if (fat_register_device(dev_desc, part) != 0) {
err = fat_register_device(dev_desc, part);
if (err) {
printf("Failed to register %s%d:%d\n", printf("Failed to register %s%d:%d\n",
FAT_ENV_INTERFACE, dev, part); FAT_ENV_INTERFACE, dev, part);
return 1; return 1;
} }
env_new.crc = crc32(0, env_new.data, ENV_SIZE); env_new.crc = crc32(0, env_new.data, ENV_SIZE);
if (file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t)) == -1) { err = file_fat_write(FAT_ENV_FILE, (void *)&env_new, sizeof(env_t));
if (err == -1) {
printf("\n** Unable to write \"%s\" from %s%d:%d **\n", printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
return 1; return 1;
@ -110,9 +114,10 @@ void env_relocate_spec(void)
block_dev_desc_t *dev_desc = NULL; block_dev_desc_t *dev_desc = NULL;
int dev = FAT_ENV_DEVICE; int dev = FAT_ENV_DEVICE;
int part = FAT_ENV_PART; int part = FAT_ENV_PART;
int err;
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
if (strcmp (FAT_ENV_INTERFACE, "mmc") == 0) { if (strcmp(FAT_ENV_INTERFACE, "mmc") == 0) {
struct mmc *mmc = find_mmc_device(dev); struct mmc *mmc = find_mmc_device(dev);
if (!mmc) { if (!mmc) {
@ -133,14 +138,17 @@ void env_relocate_spec(void)
set_default_env(NULL); set_default_env(NULL);
return; return;
} }
if (fat_register_device(dev_desc, part) != 0) {
err = fat_register_device(dev_desc, part);
if (err) {
printf("Failed to register %s%d:%d\n", printf("Failed to register %s%d:%d\n",
FAT_ENV_INTERFACE, dev, part); FAT_ENV_INTERFACE, dev, part);
set_default_env(NULL); set_default_env(NULL);
return; return;
} }
if (file_fat_read(FAT_ENV_FILE, (unsigned char *)&buf, CONFIG_ENV_SIZE) == -1) { err = file_fat_read(FAT_ENV_FILE, (uchar *)&buf, CONFIG_ENV_SIZE);
if (err == -1) {
printf("\n** Unable to read \"%s\" from %s%d:%d **\n", printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part); FAT_ENV_FILE, FAT_ENV_INTERFACE, dev, part);
set_default_env(NULL); set_default_env(NULL);