From: Michal Simek Date: Fri, 2 Sep 2016 07:49:52 +0000 (+0200) Subject: ARM64: zynqmp: Fix coding style X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ebca11fd267e48e296dbabb58fb0b8b0035f4f2;p=thirdparty%2Fu-boot.git ARM64: zynqmp: Fix coding style Fix long lines and checkpatch.pl violations. Signed-off-by: Michal Simek --- diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index a25cc997420..3659e8b6574 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -95,9 +95,8 @@ static char *zynqmp_get_silicon_idcode_name(void) id = chip_id(); for (i = 0; i < ARRAY_SIZE(zynqmp_devices); i++) { - if (zynqmp_devices[i].id == id) { + if (zynqmp_devices[i].id == id) return zynqmp_devices[i].name; - } } return "unknown"; } @@ -109,13 +108,15 @@ int board_init(void) { printf("EL Level:\tEL%d\n", current_el()); -#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && !defined(CONFIG_SPL_BUILD) || \ - (defined(CONFIG_SPL_FPGA_SUPPORT) && defined(CONFIG_SPL_BUILD)) +#if defined(CONFIG_FPGA) && defined(CONFIG_FPGA_ZYNQMPPL) && \ + !defined(CONFIG_SPL_BUILD) || (defined(CONFIG_SPL_FPGA_SUPPORT) && \ + defined(CONFIG_SPL_BUILD)) if (current_el() != 3) { static char version[ZYNQMP_VERSION_SIZE]; strncat(version, "xczu", ZYNQMP_VERSION_SIZE); - zynqmppl.name = strncat(version, zynqmp_get_silicon_idcode_name(), + zynqmppl.name = strncat(version, + zynqmp_get_silicon_idcode_name(), ZYNQMP_VERSION_SIZE); printf("Chip ID:\t%s\n", zynqmppl.name); fpga_init();