git: c9e880c0ceef - main - gpiobus: Use a bus_child_deleted method to free ivars for children

[John Baldwin]

The branch main has been updated by jhb:

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

commit c9e880c0ceef9541625c18add3f5a8499137e016
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2024-11-01 14:09:39 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2024-11-01 14:09:39 +0000

    gpiobus: Use a bus_child_deleted method to free ivars for children
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D47369
---
 sys/dev/gpio/gpiobus.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index 02c02bcd645d..6b0f8e5ed3ff 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -574,9 +574,7 @@ int
 gpiobus_detach(device_t dev)
 {
        struct gpiobus_softc *sc;
-       struct gpiobus_ivar *devi;
-       device_t *devlist;
-       int i, err, ndevs;
+       int i, err;
 
        sc = GPIOBUS_SOFTC(dev);
        KASSERT(mtx_initialized(&sc->sc_mtx),
@@ -585,17 +583,9 @@ gpiobus_detach(device_t dev)
 
        if ((err = bus_generic_detach(dev)) != 0)
                return (err);
-
-       if ((err = device_get_children(dev, &devlist, &ndevs)) != 0)
+       if ((err = device_delete_children(dev)) != 0)
                return (err);
-       for (i = 0; i < ndevs; i++) {
-               devi = GPIOBUS_IVAR(devlist[i]);
-               gpiobus_free_ivars(devi);
-               resource_list_free(&devi->rl);
-               free(devi, M_DEVBUF);
-               device_delete_child(dev, devlist[i]);
-       }
-       free(devlist, M_TEMP);
+
        rman_fini(&sc->sc_intr_rman);
        if (sc->sc_pins) {
                for (i = 0; i < sc->sc_npins; i++) {
@@ -699,6 +689,19 @@ gpiobus_add_child(device_t dev, u_int order, const char 
*name, int unit)
        return (child);
 }
 
+static void
+gpiobus_child_deleted(device_t dev, device_t child)
+{
+       struct gpiobus_ivar *devi;
+
+       devi = GPIOBUS_IVAR(child);
+       if (devi == NULL)
+               return;
+       gpiobus_free_ivars(devi);
+       resource_list_free(&devi->rl);
+       free(devi, M_DEVBUF);
+}
+
 static int
 gpiobus_rescan(device_t dev)
 {
@@ -718,7 +721,6 @@ static void
 gpiobus_hinted_child(device_t bus, const char *dname, int dunit)
 {
        struct gpiobus_softc *sc = GPIOBUS_SOFTC(bus);
-       struct gpiobus_ivar *devi;
        device_t child;
        const char *pins;
        int irq, pinmask;
@@ -728,19 +730,14 @@ gpiobus_hinted_child(device_t bus, const char *dname, int 
dunit)
        }
 
        child = BUS_ADD_CHILD(bus, 0, dname, dunit);
-       devi = GPIOBUS_IVAR(child);
        if (resource_int_value(dname, dunit, "pins", &pinmask) == 0) {
                if (gpiobus_parse_pins(sc, child, pinmask)) {
-                       resource_list_free(&devi->rl);
-                       free(devi, M_DEVBUF);
                        device_delete_child(bus, child);
                        return;
                }
        }
        else if (resource_string_value(dname, dunit, "pin_list", &pins) == 0) {
                if (gpiobus_parse_pin_list(sc, child, pins)) {
-                       resource_list_free(&devi->rl);
-                       free(devi, M_DEVBUF);
                        device_delete_child(bus, child);
                        return;
                }
@@ -1045,6 +1042,7 @@ static device_method_t gpiobus_methods[] = {
        DEVMETHOD(bus_get_resource_list,        gpiobus_get_resource_list),
        DEVMETHOD(bus_get_rman,         gpiobus_get_rman),
        DEVMETHOD(bus_add_child,        gpiobus_add_child),
+       DEVMETHOD(bus_child_deleted,    gpiobus_child_deleted),
        DEVMETHOD(bus_rescan,           gpiobus_rescan),
        DEVMETHOD(bus_probe_nomatch,    gpiobus_probe_nomatch),
        DEVMETHOD(bus_print_child,      gpiobus_print_child),