Tue Nov 24 06:36:36 2020 UTC ()

Simplify.  NFCI.


(skrll)

diff -r1.78 -r1.79 src/sys/arch/evbarm/fdt/fdt_machdep.c

--- src/sys/arch/evbarm/fdt/fdt_machdep.c 2020/11/07 08:28:15	1.78
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c 2020/11/24 06:36:36	1.79

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_machdep.c,v 1.78 2020/11/07 08:28:15 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.79 2020/11/24 06:36:36 skrll Exp $ */
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.78 2020/11/07 08:28:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.79 2020/11/24 06:36:36 skrll Exp $");
 #include "opt_machdep.h"
 #include "opt_bootconfig.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
 #include "opt_arm_debug.h"
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 #include "opt_efi.h"
 #include "genfb.h"
 #include "ukbd.h"
 #include "wsdisplay.h"
 @@ -524,37 +524,37 @@ fdt_map_efi_runtime(const char *prop, en
 #endif
 vaddr_t
 initarm(void *arg)
+{
 	const struct arm_platform *plat;
 	uint64_t memory_start, memory_end;
 	/* set temporally to work printf()/panic() even before consinit() */
 	cn_tab = &earlycons;
 	/* Load FDT */
 	int error = fdt_check_header(fdt_addr_r);
-	if (error == 0) {
+	if (error != 0)
 		/* If the DTB is too big, try to pack it in place first. */
 		if (fdt_totalsize(fdt_addr_r) > sizeof(fdt_data))
 			(void)fdt_pack(__UNCONST(fdt_addr_r));
 		error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data));
 		if (error != 0)
 			panic("fdt_move failed: %s", fdt_strerror(error));
 		fdtbus_init(fdt_data);
 	} else {
 		panic("fdt_check_header failed: %s", fdt_strerror(error));
 	/* If the DTB is too big, try to pack it in place first. */
 	if (fdt_totalsize(fdt_addr_r) > sizeof(fdt_data))
 		(void)fdt_pack(__UNCONST(fdt_addr_r));
 	error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data));
 	if (error != 0)
 		panic("fdt_move failed: %s", fdt_strerror(error));
 	fdtbus_init(fdt_data);
 	/* Lookup platform specific backend */
 	plat = arm_fdt_platform();
 	if (plat == NULL)
 		panic("Kernel does not support this device");
 	/* Early console may be available, announce ourselves. */
 	VPRINTF("FDT<%p>\n", fdt_addr_r);
 	const int chosen = OF_finddevice("/chosen");
 	if (chosen >= 0)
 		OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
 	boot_args = bootargs;