git: bdc9ece97b80 - main - Move the GICv3 bus_print_child function to the parent

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=bdc9ece97b80c3a8b8c9161d95ef908172eb316a

commit bdc9ece97b80c3a8b8c9161d95ef908172eb316a
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-09-22 10:50:15 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-09-23 14:28:45 +0000

    Move the GICv3 bus_print_child function to the parent
    
    This should be common for both ACPI and FDT. Move this to the common
    part of the driver.
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/arm64/arm64/gic_v3.c     | 17 +++++++++++++++++
 sys/arm64/arm64/gic_v3_fdt.c | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
index b4678d95fee5..759d50f0941e 100644
--- a/sys/arm64/arm64/gic_v3.c
+++ b/sys/arm64/arm64/gic_v3.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #include "gic_v3_reg.h"
 #include "gic_v3_var.h"
 
+static bus_print_child_t gic_v3_print_child;
 static bus_get_domain_t gic_v3_get_domain;
 static bus_read_ivar_t gic_v3_read_ivar;
 static bus_write_ivar_t gic_v3_write_ivar;
@@ -119,6 +120,7 @@ static device_method_t gic_v3_methods[] = {
 	DEVMETHOD(device_detach,	gic_v3_detach),
 
 	/* Bus interface */
+	DEVMETHOD(bus_print_child,	gic_v3_print_child),
 	DEVMETHOD(bus_get_domain,	gic_v3_get_domain),
 	DEVMETHOD(bus_read_ivar,	gic_v3_read_ivar),
 	DEVMETHOD(bus_write_ivar,	gic_v3_write_ivar),
@@ -439,6 +441,21 @@ gic_v3_detach(device_t dev)
 	return (0);
 }
 
+static int
+gic_v3_print_child(device_t bus, device_t child)
+{
+	struct resource_list *rl;
+	int retval = 0;
+
+	rl = BUS_GET_RESOURCE_LIST(bus, child);
+	KASSERT(rl != NULL, ("%s: No resource list", __func__));
+	retval += bus_print_child_header(bus, child);
+	retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
+	retval += bus_print_child_footer(bus, child);
+
+	return (retval);
+}
+
 static int
 gic_v3_get_domain(device_t dev, device_t child, int *domain)
 {
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
index b0b532a56dec..dc1445340943 100644
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
  */
 static int gic_v3_fdt_probe(device_t);
 static int gic_v3_fdt_attach(device_t);
-static int gic_v3_fdt_print_child(device_t, device_t);
 
 static struct resource *gic_v3_ofw_bus_alloc_res(device_t, device_t, int, int *,
     rman_res_t, rman_res_t, rman_res_t, u_int);
@@ -66,7 +65,6 @@ static device_method_t gic_v3_fdt_methods[] = {
 	DEVMETHOD(device_attach,	gic_v3_fdt_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		gic_v3_fdt_print_child),
 	DEVMETHOD(bus_alloc_resource,		gic_v3_ofw_bus_alloc_res),
 	DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
 	DEVMETHOD(bus_get_resource_list,	gic_v3_fdt_get_resource_list),
@@ -210,21 +208,6 @@ struct gic_v3_ofw_devinfo {
 	struct resource_list	di_rl;
 };
 
-static int
-gic_v3_fdt_print_child(device_t bus, device_t child)
-{
-	struct resource_list *rl;
-	int retval = 0;
-
-	rl = BUS_GET_RESOURCE_LIST(bus, child);
-	KASSERT(rl != NULL, ("%s: No resource list", __func__));
-	retval += bus_print_child_header(bus, child);
-	retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#jx");
-	retval += bus_print_child_footer(bus, child);
-
-	return (retval);
-}
-
 static const struct ofw_bus_devinfo *
 gic_v3_ofw_get_devinfo(device_t bus __unused, device_t child)
 {