From nobody Tue Nov 05 01:33:42 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 4Xj9pZ6c9rz5cqDf; Tue, 05 Nov 2024 01:33:42 +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 4Xj9pZ5mnMz4sxh; Tue, 5 Nov 2024 01:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730770422; 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=LDCmomfpZf8C5u42WwKjtqTLJkR7nPOgiwOTZaH9Iaw=; b=MrgMeU9mUhJrhOtdEKV0IsU9XV3TfFTgAVXxYWRffzfq8NbN4oXsvI+z4uJOehmQV0PEb5 184INVvXia9L761ffa1hAEAyx5XwGlx4keglupj6mr6aRhbx3a8NmC8To0+mgq9p/44kLz 0CriqpfSHWrC7JvI0rlP2Xa2qz33RLwjKwZqH9XHxRMSVTkcMQKE+/99nUee6Lp3C//QWF xwsN6TSB9Z5yLIi9Y4GwtwWQKWErFDfqrC8Cx9hdsyrw9yIzb1VKeu/d8Nn1qb41x/s3/7 n3ob8GIlMajx8nwH4RV2ZJDrzRREfbBjTWNsLSDXvgdcx2XpAto31AYhvB5J1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730770422; 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=LDCmomfpZf8C5u42WwKjtqTLJkR7nPOgiwOTZaH9Iaw=; b=lST2Sbd35hDYDk4Yzs7FO8sT9KtniI0njrIBVbv5okLHci+HPrc69h5SwFRcHHnCZNqkzC 3+wgbXb8Xj+S0FLgFopwGQISTJ3mVLGcX9cRlaoxmpozIX2EtzB6z+JV+Vv0BBLvIkxORD oyF1Yr9VjUOaunDRjgKzA9bZMcSh68HVNES82WTel0oJpM9PGy0wssljU2c+2vW1WoyOiX cGKF40KOta7E44+I7OaPIYlbwYVPIwqKKcT8fG5dKzhmkuUxRqkviwR/QNdxUv4Cn6/gkN RfbzAbWQpTYxlQJha9jUhfLHaYoxeoCKWKWu7scnFkr3faMziDjEQ8PapP6DXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730770422; a=rsa-sha256; cv=none; b=gt3u/BPax+R5TCA7X9pblORWgI7RFXwNN1QYBHCMV5T1qonMkiNd4VOW4074pDqFYKam8V +mlSdHuNmcdbRs70h6tljZo5ZSsQHR4iXZ9mfZb9J0IgVVgzx0f8atAsJM7sRGXWNju7JN vHMfqOEng3VmpBSHkM91DpzOSZ0/R+R8sfQsKz81iuclkd3vgjtandNF6387HJDEuOgvne sPYjBYzsbhJD6GXnxpf2d5pgp9T9cfrrx4L30Iws22C8MM7JIVoxrCUNHTcvViDuopLxwK RJiOrNXy9M57ADWcMt9v1POYfsm4S2IAWBRBwAOnmcLi96iqHv+2zVzFJorTeQ== 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 4Xj9pZ5Mj2zx70; Tue, 5 Nov 2024 01:33:42 +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 4A51Xgl2049070; Tue, 5 Nov 2024 01:33:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A51XgO4049067; Tue, 5 Nov 2024 01:33:42 GMT (envelope-from git) Date: Tue, 5 Nov 2024 01:33:42 GMT Message-Id: <202411050133.4A51XgO4049067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d62d10eb1229 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d62d10eb1229c9aa0b3cf1b18872df59c18155db Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d62d10eb1229c9aa0b3cf1b18872df59c18155db commit d62d10eb1229c9aa0b3cf1b18872df59c18155db Author: John Baldwin AuthorDate: 2024-11-05 01:30:13 +0000 Commit: John Baldwin CommitDate: 2024-11-05 01:30:13 +0000 Use bus_generic_detach directly instead of a wrapper Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47386 --- 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 0f23f6b25fe1..81a1ee8ce25c 100644 --- a/sys/dev/acpica/acpi_container.c +++ b/sys/dev/acpica/acpi_container.c @@ -38,7 +38,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, @@ -54,7 +53,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), @@ -108,13 +107,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 8c805254a2e6..9e0d1f2a1ce5 100644 --- a/sys/dev/adb/adb_bus.c +++ b/sys/dev/adb/adb_bus.c @@ -42,7 +42,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); @@ -57,7 +56,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), @@ -188,11 +187,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 c34493254e0f..64d3b23c2372 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 */