summaryrefslogtreecommitdiffstats
path: root/drivers/hab
diff options
context:
space:
mode:
authorRouven Czerwinski <r.czerwinski@pengutronix.de>2019-08-06 07:10:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-08-07 09:42:09 +0200
commit94a3a0048282e5f02a93b55203612c3163808d8f (patch)
tree0ed11e64e792d61ccf7440050bdb0f6a4a1e1368 /drivers/hab
parentaf66ec677c40dfaed68a124d21dd59d5f8c63381 (diff)
downloadbarebox-94a3a0048282e5f02a93b55203612c3163808d8f.tar.gz
barebox-94a3a0048282e5f02a93b55203612c3163808d8f.tar.xz
i.MX: HABv4: ignore return for i.MX28/6 initcalls
Move the status call below the explanations and return Null. No functional changes intended. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/hab')
-rw-r--r--drivers/hab/habv4.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/hab/habv4.c b/drivers/hab/habv4.c
index 6a60be6853..b11cf7be34 100644
--- a/drivers/hab/habv4.c
+++ b/drivers/hab/habv4.c
@@ -511,21 +511,17 @@ int imx6_hab_get_status(void)
static int init_imx6_hab_get_status(void)
{
- int ret = 0;
-
if (!cpu_is_mx6())
/* can happen in multi-image builds and is not an error */
return 0;
- ret = imx6_hab_get_status();
-
/*
* Nobody will check the return value if there were HAB errors, but the
* initcall will fail spectaculously with a strange error message.
*/
- if (ret == -EPERM)
- return 0;
- return ret;
+ imx6_hab_get_status();
+
+ return 0;
}
/*
@@ -544,19 +540,15 @@ int imx28_hab_get_status(void)
static int init_imx28_hab_get_status(void)
{
- int ret = 0;
-
if (!cpu_is_mx28())
/* can happen in multi-image builds and is not an error */
return 0;
- ret = imx28_hab_get_status();
/* nobody will check the return value if there were HAB errors, but the
* initcall will fail spectaculously with a strange error message. */
- if (ret == -EPERM)
- return 0;
- return ret;
+ imx28_hab_get_status();
+ return 0;
}
/* i.MX28 ROM code can be run after MMU setup to make use of caching */
postmmu_initcall(init_imx28_hab_get_status);