From nobody Thu Feb 27 17:19:19 2025 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 4Z3dP32bqpz59Jhw; Thu, 27 Feb 2025 17:19:19 +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 4Z3dP31pj7z46yV; Thu, 27 Feb 2025 17:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740676759; 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=+TtCuVhoSSHwL5vKBLkrA1ZDDvx24jRb68+m7vn34mY=; b=ypiOa1R1vm9uwnU+ydwg6NqXjvxd4/LSb58puVH+Kqm8w1CoYmdgb5ZhVrmxZLZtpTP8HK igvPJp/6+XDaRUCgrV7sqkZbo2/EA3kFK7JuMPc3nKdTBNtxIDxVXn1zh/QWVKkoGuXr7a KjFYPJPJ2YQJfqyWgJZ42BR8Y/QRQoMUo9MXYstdokAv9lK3UGN6Vu6obquR+Mpf1f/DNJ Y0x6wdeQPUuG8Oe8jV7vvpnkN6ElElVCc3KF/9Fd/9Mh6/luAjlbe8XUDgd52iamowbEIo 0LoopJETO1T2XDE4HOTMl09Ru1ORJlUldbWsio5H9ccYOABcs+CkrYO7m8mq8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740676759; a=rsa-sha256; cv=none; b=bqDMDtYtMLl++kUiEp1bk1Y22fGE77LdPBbU7LrBi1A1pL7p0W22yskHJdZJNua0meQ3Sw /kn1fKIT122Lx4wyVnszAkitJPpXIEgnxjKxazmCoHgQEC1OkgPwpr1tHrJRHpDLjP0eLW HpltVE6vpo4IJFHc4BEvr1pmDOx5xp9ayv0hHKN2TtEqfZfTeTz8jXl2TcOLbt8lyUk7br ub4Y8lO5Z9nIZNylg1lXVDULl3om2ncUrEky8N+gsZ0YWJB+nBprnJIC/pUZRxBim+p3Lc wMpptIJ6nQwMWxMMp7fgFrJc4tG+Et9GUqXa64WXju+DbAbkKyc4pvD+wLm1RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740676759; 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=+TtCuVhoSSHwL5vKBLkrA1ZDDvx24jRb68+m7vn34mY=; b=D7RGlAmpzIDeV/NMuovmIZC5lln748z3SmoisJzSSAykNdBVirUS7CKvhtWYFTgweFn8wS EulR4esVY73soK2y7LqgK9A4kF/MTmkPCy2Ll4pk3q7Gf/PlKwhBIHxmo1/GDj9l6pq45g Eno7AZtZ9b6pnptFKoTVIajlMPF1l7vq6eDidRfEZWXN//hN0p3vPAbP1XQVOUc2OewkiV cSju2pNBxWKy5bs05MGplV6f2ltLNGVyzdkUXDs3tbx4smB/AmlKroVhdTY3NGI5wFlMT3 uUwCZ+Vu25n7PuYkw/YVCnJaoy4KL9AwmxsADlCUwpvUJAV12bH4AqxtwqDNPQ== 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 4Z3dP31HwlzsS6; Thu, 27 Feb 2025 17:19:19 +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 51RHJJNx056780; Thu, 27 Feb 2025 17:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RHJJ1q056777; Thu, 27 Feb 2025 17:19:19 GMT (envelope-from git) Date: Thu, 27 Feb 2025 17:19:19 GMT Message-Id: <202502271719.51RHJJ1q056777@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: 513cd54856e1 - stable/14 - Use bus_generic_detach directly instead of a wrapper 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: 513cd54856e1730dea9d709477319ff075f5112d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=513cd54856e1730dea9d709477319ff075f5112d commit 513cd54856e1730dea9d709477319ff075f5112d Author: John Baldwin AuthorDate: 2024-11-05 01:30:13 +0000 Commit: John Baldwin CommitDate: 2025-02-27 17:08:57 +0000 Use bus_generic_detach directly instead of a wrapper Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47386 (cherry picked from commit d62d10eb1229c9aa0b3cf1b18872df59c18155db) --- sys/dev/acpica/acpi_container.c | 10 +--------- sys/dev/adb/adb_bus.c | 8 +------- sys/dev/mdio/mdio.c | 10 +--------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/sys/dev/acpica/acpi_container.c b/sys/dev/acpica/acpi_container.c index 43da3cdc47e1..057f72716fed 100644 --- a/sys/dev/acpica/acpi_container.c +++ b/sys/dev/acpica/acpi_container.c @@ -39,7 +39,6 @@ ACPI_MODULE_NAME("CONTAINER") static int acpi_syscont_probe(device_t); static int acpi_syscont_attach(device_t); -static int acpi_syscont_detach(device_t); static int acpi_syscont_alloc_msi(device_t, device_t, int count, int maxcount, int *irqs); static int acpi_syscont_release_msi(device_t bus, device_t dev, @@ -55,7 +54,7 @@ static device_method_t acpi_syscont_methods[] = { /* Device interface */ DEVMETHOD(device_probe, acpi_syscont_probe), DEVMETHOD(device_attach, acpi_syscont_attach), - DEVMETHOD(device_detach, acpi_syscont_detach), + DEVMETHOD(device_detach, bus_generic_detach), /* Bus interface */ DEVMETHOD(bus_add_child, bus_generic_add_child), @@ -109,13 +108,6 @@ acpi_syscont_attach(device_t dev) return (bus_generic_attach(dev)); } -static int -acpi_syscont_detach(device_t dev) -{ - - return (bus_generic_detach(dev)); -} - static int acpi_syscont_alloc_msi(device_t bus, device_t dev, int count, int maxcount, int *irqs) diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c index ac09231fb914..144cce51b9f4 100644 --- a/sys/dev/adb/adb_bus.c +++ b/sys/dev/adb/adb_bus.c @@ -43,7 +43,6 @@ static int adb_bus_probe(device_t dev); static int adb_bus_attach(device_t dev); -static int adb_bus_detach(device_t dev); static void adb_bus_enumerate(void *xdev); static void adb_probe_nomatch(device_t dev, device_t child); static int adb_print_child(device_t dev, device_t child); @@ -58,7 +57,7 @@ static device_method_t adb_bus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, adb_bus_probe), DEVMETHOD(device_attach, adb_bus_attach), - DEVMETHOD(device_detach, adb_bus_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), @@ -189,11 +188,6 @@ adb_bus_enumerate(void *xdev) config_intrhook_disestablish(&sc->enum_hook); } -static int adb_bus_detach(device_t dev) -{ - return (bus_generic_detach(dev)); -} - static void adb_probe_nomatch(device_t dev, device_t child) { diff --git a/sys/dev/mdio/mdio.c b/sys/dev/mdio/mdio.c index 55122edd16cc..b3446445901d 100644 --- a/sys/dev/mdio/mdio.c +++ b/sys/dev/mdio/mdio.c @@ -59,14 +59,6 @@ mdio_attach(device_t dev) return (bus_generic_attach(dev)); } -static int -mdio_detach(device_t dev) -{ - - bus_generic_detach(dev); - return (0); -} - static int mdio_readreg(device_t dev, int phy, int reg) { @@ -108,7 +100,7 @@ static device_method_t mdio_methods[] = { DEVMETHOD(device_identify, mdio_identify), DEVMETHOD(device_probe, mdio_probe), DEVMETHOD(device_attach, mdio_attach), - DEVMETHOD(device_detach, mdio_detach), + DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), /* bus interface */