[POWERPC] bootwrapper: One check less in fsl_get_immr() after error detection

SF Markus Elfring
2015-12-14T22:10:41Z

Date: Mon, 14 Dec 2015 23:01:32 +0100

A status check was performed by the fsl_get_immr() function even if it
was known already that a system setting did not fit to the expectations.

This implementation detail could be improved by an adjustment for
a jump label according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/powerpc/boot/fsl-soc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/boot/fsl-soc.c b/arch/powerpc/boot/fsl-soc.c
index b835ed6..ff1dae3 100644
--- a/arch/powerpc/boot/fsl-soc.c
+++ b/arch/powerpc/boot/fsl-soc.c
@@ -34,24 +34,24 @@ u32 *fsl_get_immr(void)
naddr = 2;

if (naddr != 1 && naddr != 2)
- goto err;
+ goto report_failure;

size = getprop(soc, "ranges", prop_buf, MAX_PROP_LEN);

if (size < 12)
- goto err;
+ goto report_failure;
if (prop_buf[0] != 0)
- goto err;
+ goto report_failure;
if (naddr == 2 && prop_buf[1] != 0)
- goto err;
+ goto report_failure;

if (!dt_xlate_addr(soc, prop_buf + naddr, 8, &ret))
ret = 0;
}

-err:
- if (!ret)
+ if (!ret) {
+report_failure:
printf("fsl_get_immr: Failed to find immr base\r\n");
-
+ }
return (u32 *)ret;
}
--
2.6.3