From nobody Sun Dec 01 04:57:21 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 4Y1F5Y41y6z5gD38; Sun, 01 Dec 2024 04:57:21 +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 4Y1F5Y2cFrz49ly; Sun, 1 Dec 2024 04:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029041; 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=tdU7Nw8ibQ7oQj2QVZEgfnpMIqMJUDxVp1+CvqcUSTA=; b=jaMU1nv+j7+BQAWClbnDPyNGpImg4uHzU6GQ+SSX+BxV0T7GZlNRxCoRCZ0Pd7h/cY40Hq ciLQ15+AfRkus0d14wZA/qd9sQOpo1N+MUA8W8kh8odw38pwuSjPwVwe3iuGZAU6rAJYtA lykBYAMfgVx7I64JBJnqJ0zjppf3oVjlwMl8QHNy0dnuyb0p4oG1pU4QO4pQWz4exr3iOT ZkmMtorIlHhcjsdTWZ0EBszYQDzV7Nb7VWRPFjntts/JO8U+yyjK6zwdG9T5qDnkwVsPqM QeIBi770zxIURsbKC7hTFh+me68byLj/x9mmXfa9zuW/g4cYeSm0UPInlrZEiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029041; 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=tdU7Nw8ibQ7oQj2QVZEgfnpMIqMJUDxVp1+CvqcUSTA=; b=W1jtd5rjmd2kmUUg0PGJeRV/gSXCczYp24yHJ2l1RsSIGSMkQ0OukGYalWixCkgW1CHwWu HURLF822OXmPlTj/dsScPAmF+zH62A7+x/imaqjpyI0ap7QMxWWk5pDaSANuYfkSBm/IZY Pw6Yvppys/vCo2rViPJh9eEDPhX83M9Wl3N0Cpdx92AhqFRIsTChn7ZyWvWnh6FBoQgyEX a9kL0BXGrs/751CtgFHJehoOeILO+r6WPVatcWbCr088eB9DFzmB6uVQs85Fgj9OI9wyEv n86FlcxWeXfpzsBAOR7VRZl3TlN0AKaMY75tJX54KrPLCk4DLaMEIIlcVRwryQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029041; a=rsa-sha256; cv=none; b=p/fPtCzKRVNWL1xjmcLuDZ4X/8hi9McAAvJ2oi2Z/gCIp+vRWfEr+pojSpvWpUMZbIITID lRVn9kVqdo+OFJ/u3p5iyB7SNrkQKVGHAnDmt64LHDcypSF+fHB0Jw8vua+tEiiZjDIhf0 VpLlnrVWgEJN+FL1RUPLYDGOG7Ry/7VmmF2Dn5yAVy6/mbSKUO/Jfq2JV5RBhqFGHgl9m7 a2+HBw7fzF/z+WhgMyV2g9vlW5BLtU/yx15QVx9qd2lN031+DkySVY8RJ4WeK+ZS6m+hng nzb4p/62ELF6IfXUCQLnNvqPgjcZi3GK1O2+ENpLCNqxPL8FkqgJrhnLOPoHzg== 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 4Y1F5Y2DpJzfQv; Sun, 1 Dec 2024 04:57:21 +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 4B14vL4L095716; Sun, 1 Dec 2024 04:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14vLwp095713; Sun, 1 Dec 2024 04:57:21 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:57:21 GMT Message-Id: <202412010457.4B14vLwp095713@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: fa95268aeb8a - stable/14 - Remove bogus detach routines 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: fa95268aeb8acc2e10588aa78d3335bcfccb10a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fa95268aeb8acc2e10588aa78d3335bcfccb10a5 commit fa95268aeb8acc2e10588aa78d3335bcfccb10a5 Author: John Baldwin AuthorDate: 2024-11-05 01:31:16 +0000 Commit: John Baldwin CommitDate: 2024-12-01 02:46:07 +0000 Remove bogus detach routines These drivers are not bus drivers, and would need proper detach routines that tore down state stored in the softc. Better to just fail detach outright instead of an incorrect success. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47389 (cherry picked from commit 7ebc7d1ab76b9d06be9400d6c9fc74fcc43603a1) --- sys/dev/gpio/gpiomdio.c | 1 - sys/dev/sff/sfp_fdt.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/dev/gpio/gpiomdio.c b/sys/dev/gpio/gpiomdio.c index deb9a25bd290..dc43b2783bc5 100644 --- a/sys/dev/gpio/gpiomdio.c +++ b/sys/dev/gpio/gpiomdio.c @@ -213,7 +213,6 @@ static device_method_t gpiomdio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, gpiomdio_probe), DEVMETHOD(device_attach, gpiomdio_attach), - DEVMETHOD(device_detach, bus_generic_detach), /* MDIO interface */ DEVMETHOD(miibus_readreg, gpiomdio_readreg), diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c index 7430282ede70..e566d8ced78c 100644 --- a/sys/dev/sff/sfp_fdt.c +++ b/sys/dev/sff/sfp_fdt.c @@ -138,7 +138,6 @@ static device_method_t sfp_fdt_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sfp_fdt_probe), DEVMETHOD(device_attach, sfp_fdt_attach), - DEVMETHOD(device_detach, bus_generic_detach), /* SFF */ DEVMETHOD(sff_get_i2c_bus, sfp_fdt_get_i2c_bus),