env_import (and env_import_redund) currently return 1 on success
and 0 on error. However, they are only used from functions
returning 0 on success or a negative value on error.
Let's clean this up by making env_import and env_import_redund
return 0 on success and -EIO on error (as was the case for all
users before).
Users that cared for the return value are also updated. Funny
enough, this only affects onenand.c and sf.c
Signed-off-by: Simon Goldschmidt <sgoldschm...@de.pepperl-fuchs.com>
---
env/common.c | 8 ++++----
env/onenand.c | 4 ++--
env/sf.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/env/common.c b/env/common.c
index c633502d68..363ba6fead 100644
--- a/env/common.c
+++ b/env/common.c
@@ -118,21 +118,21 @@ int env_import(const char *buf, int check)
if (crc32(0, ep->data, ENV_SIZE) != crc) {
set_default_env("!bad CRC");
- return 0;
+ return -EIO;
}
}
if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0, 0,
0, NULL)) {
gd->flags |= GD_FLG_ENV_READY;
- return 1;
+ return 0;
}
pr_err("Cannot import environment: errno = %d\n", errno);
set_default_env("!import failed");
- return 0;
+ return -EIO;
}
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
@@ -153,7 +153,7 @@ int env_import_redund(const char *buf1, const char *buf2)
if (!crc1_ok && !crc2_ok) {
set_default_env("!bad CRC");
- return 0;
+ return -EIO;
} else if (crc1_ok && !crc2_ok) {
gd->env_valid = ENV_VALID;
} else if (!crc1_ok && crc2_ok) {
diff --git a/env/onenand.c b/env/onenand.c
index 2e3045c5f5..10a8cccbe8 100644
--- a/env/onenand.c
+++ b/env/onenand.c
@@ -57,10 +57,10 @@ static int env_onenand_load(void)
#endif /* !ENV_IS_EMBEDDED */
rc = env_import(buf, 1);
- if (rc)
+ if (!rc)
gd->env_valid = ENV_VALID;
- return rc ? 0 : -EIO;
+ return rc;
}
static int env_onenand_save(void)
diff --git a/env/sf.c b/env/sf.c
index a2e4c93631..3dc54410df 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -236,7 +236,7 @@ static int env_sf_load(void)
ep = tmp_env2;
ret = env_import((char *)ep, 0);
- if (!ret) {
+ if (ret) {
pr_err("Cannot import environment: errno = %d\n", errno);
set_default_env("!env_import failed");
}
@@ -336,7 +336,7 @@ static int env_sf_load(void)
}
ret = env_import(buf, 1);
- if (ret)
+ if (!ret)
gd->env_valid = ENV_VALID;
err_read:
--
2.11.0
Pepperl+Fuchs GmbH, Mannheim
Geschaeftsfuehrer/Managing Directors: Dr.-Ing. Gunther Kegel (Vors./CEO),
Werner Guthier, Mehmet Hatiboglu
Vorsitzender des Aufsichtsrats/Chairman of the supervisory board: Claus Michael
Registergericht/Register Court: AG Mannheim HRB 4713
Wichtiger Hinweis:
Diese E-Mail einschliesslich ihrer Anhaenge enthaelt vertrauliche und rechtlich
geschuetzte Informationen, die nur fuer den Adressaten bestimmt sind.
Sollten Sie nicht der bezeichnete Adressat sein, so teilen Sie dies bitte dem
Absender umgehend mit und loeschen Sie diese Nachricht und ihre Anhaenge. Die
unbefugte Weitergabe, das Anfertigen von Kopien und jede Veraenderung der
E-Mail ist untersagt. Der Absender haftet nicht fuer Inhalte von veraenderten
E-Mails.
Important Information:
This e-mail message including its attachments contains confidential and legally
protected information solely intended for the addressee. If you are not the
intended addressee of this message, please contact the addresser immediately
and delete this message including its attachments. The unauthorized
dissemination, copying and change of this e-mail are strictly forbidden. The
addresser shall not be liable for the content of such changed e-mails.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
