From nobody Sun Dec 01 04:57:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1F5Q6QJpz5gDDk; Sun, 01 Dec 2024 04:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1F5Q4XKKz49GF; Sun, 1 Dec 2024 04:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QsUUUlLI3FaWQBN7bOSGVy8fPj9c0PEkRdzXjLqpI/k=; b=j+Pq6NQFKb5NblyXg2xi1S5YE4MifOt/x1274BHrZyeEvbVhOIEHJNQoXhHvEsSxpgVMVG HZvpy0d9MSTk4lKnDzCoPBF/1ElhMRPBSDi0dSmIfOVnXUmAziRfIFrglNrBztUVlBPnZm MV5/jwytS0pjvKfOrUXNRss0DE8NJkAvky3hVynSLqKNBBvcW+WNhPpjpGHIN8YQy/8CV6 Rf+hyRy7XyB3lbUFFytl/CrrbcEhUvjYUs9URBN40shW1EtXgW4oxs+MT2UzoznQhB+cff cZeicQryVFDIA1gF1UgkvrBlgJWmqY8rx5FBBWWdUfs2rHcqgkEja2MN0l5y+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QsUUUlLI3FaWQBN7bOSGVy8fPj9c0PEkRdzXjLqpI/k=; b=hRHC0VQ5mRAve+0P0/jgeYz3yPdw3Xsz0nep61udowC4ZsNJVzBvLCZPyTA7zXRYMttHjq iO7wSarD9OZZ0juyJigYj11O6ommT/Yy+g8I0X/lUl6ZiwK3ob90hIQ1thNoiXlRnYGu6u LS1y79m7SpUI5i8SfOeVYrSvT4/LLWn/kTcYYsOZfddJR6do0LySYQdSIlXbEo9N36YPPq gSzoBZ44zJe2f08QCQklI4hdQu2DyAk5jALWtX/WBl2cnK746Kukkj1H/6xu2uE7UFMOj2 TuIBfMP4xcFmm3NV5adr3R7XfM8/2xbIJmOom9zOG3qR6PdlZFCvXA7vueiLvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029034; a=rsa-sha256; cv=none; b=lpP3/BWsYZTnJLGUVEbkJ0MisjVhrM9yvQAj+HeqXDgjsu8yZQvSff4QWqbpTFUL2iEEBU diiPf76/Vy6rEHB8KEokh1RhokUFhZx8CsllyyhopMaLfNtYsxk0duXqjU4hN/hFYNXMuH aSDGANJhn/A9uffckF+vlvX8VlZuuhwslLekOz9ZXR6Lj5qPvzO0ZTc5cfUZvjuFgjwRlw 76U44m1ZN04Ys0b3jBXyclgev8LkSkOZpsC1xgZi6eTN4j895Prts34glbxyUAhVM0hfHs FIP+ShOURowOtDhutHm6S8yLcutGtBNR/8Gg+OiWKDQnu/FboYOkbKULti58sQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1F5Q46hHzfLH; Sun, 1 Dec 2024 04:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B14vEl3095380; Sun, 1 Dec 2024 04:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14vE7i095377; Sun, 1 Dec 2024 04:57:14 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:57:14 GMT Message-Id: <202412010457.4B14vE7i095377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9daf43bd4586 - stable/14 - gpiobus: Use a bus_child_deleted method to free ivars for children List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9daf43bd458607d47729913d8c39c8668ae7cbe1 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9daf43bd458607d47729913d8c39c8668ae7cbe1 commit 9daf43bd458607d47729913d8c39c8668ae7cbe1 Author: John Baldwin AuthorDate: 2024-11-01 14:09:39 +0000 Commit: John Baldwin CommitDate: 2024-12-01 02:46:06 +0000 gpiobus: Use a bus_child_deleted method to free ivars for children Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47369 (cherry picked from commit c9e880c0ceef9541625c18add3f5a8499137e016) --- 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 674a04bc401b..db18703606aa 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -575,9 +575,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), @@ -586,17 +584,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++) { @@ -700,6 +690,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) { @@ -719,7 +722,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; @@ -729,19 +731,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; } @@ -1064,6 +1061,7 @@ static device_method_t gpiobus_methods[] = { DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_get_resource_list, gpiobus_get_resource_list), 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),