git: 4378bd382ea0 - main - stand/kshim: Replace bus_generic_attach with bus_attach_children

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Sat, 11 Jan 2025 04:03:49 UTC
The branch main has been updated by jhb:

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

commit 4378bd382ea0f5707099273b1fa2393979a22628
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-01-11 04:01:21 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-01-11 04:03:28 +0000

    stand/kshim: Replace bus_generic_attach with bus_attach_children
    
    Fixes:  18250ec6c089 Replace calls to bus_generic_attach with bus_attach_children
    Differential Revision:  https://reviews.freebsd.org/D48404
---
 stand/kshim/bsd_kernel.c | 6 ++----
 stand/kshim/bsd_kernel.h | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c
index ac552d86603f..fb1b4239fd03 100644
--- a/stand/kshim/bsd_kernel.c
+++ b/stand/kshim/bsd_kernel.c
@@ -205,16 +205,14 @@ bus_release_resource(device_t dev, int type, int rid, struct resource *r)
 	return (EINVAL);
 }
 
-int
-bus_generic_attach(device_t dev)
+void
+bus_attach_children(device_t dev)
 {
 	device_t child;
 
 	TAILQ_FOREACH(child, &dev->dev_children, dev_link) {
 		device_probe_and_attach(child);
 	}
-
-	return (0);
 }
 
 bus_space_tag_t
diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index 0608d32f21ec..0b5d659951a2 100644
--- a/stand/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
@@ -646,7 +646,7 @@ int bus_release_resource(device_t, int, int, struct resource *);
 void bus_release_resources(device_t, const struct resource_spec *,
     struct resource **);
 struct resource *bus_alloc_resource_any(device_t, int, int *, unsigned int);
-int bus_generic_attach(device_t);
+void bus_attach_children(device_t);
 bus_space_tag_t rman_get_bustag(struct resource *);
 bus_space_handle_t rman_get_bushandle(struct resource *);
 u_long rman_get_size(struct resource *);