From nobody Sun Dec 01 04:57:20 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 4Y1F5X44kmz5gDDv; Sun, 01 Dec 2024 04:57:20 +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 4Y1F5X227Qz49L1; Sun, 1 Dec 2024 04:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029040; 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=oerbNATS/qFM4VkIlDq3vnjTPBGkWVJrEcfaUVqARjk=; b=hJRF/y5A9kyWvmu0KCsegv3PCf03ReRk0+SfQOOSr1YMQq4cOh266AdT4TKjZTID3X8wqs bIz/nyYTnGxF2xZVXCINkekiIGWHy8oykvxsFIQ5ZrGcRLf8uzMALmbX0b+wUBVORwt4h6 lKkgimgA+HTpwRaR8jfczblPsjEvUO4qXPuG9x8trjiqKq4jLnOHKDUR7+ztdkYkHFIAri N1GNr2S7gA+EXRyS+BynyRJgXZ4QP4ifYlKnFwqYYCfawoRhx9JkliSVb93OOu2U9Zi3r/ mE73jPa6piRezSxBfLqOJ2gjoU35rSX4hji4hNs6R/oFqcuTpYw7I7/k+DGmdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029040; 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=oerbNATS/qFM4VkIlDq3vnjTPBGkWVJrEcfaUVqARjk=; b=h3tnDpSKYcYqvVxauxdPc1Z+gqvmIC9rCb6iHpwSBil+LN3hXRAie6us3bydfnQvoH1i1C mWDpwM9+AbWzRLd+hjE4SRF8/lv916Rd7iNq/k9upWfSioPS6JvZy3CovW9dTTvQQfmKyc eYfuLJFVWbj0vQ0I0asot1ExaPKoUNfCK2j1etEnGkB+THaCJ4bjFt9jDFPa83yJcCfwnG GjfaSh+6tKY/dpBiOV4Wea8duZ8vgK2raQhdsKjz4VbB3PQ+S11da+SRGfgZLFQblugZU8 L5w/qQvIqnhuTn9lGzv/eVq/k/Q+oqgoo6rXsIeC7KwulwR/0UvjizQXJ74GQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029040; a=rsa-sha256; cv=none; b=aEjRviMoXd0ynQb2+xMPO76RicxODJsiztjNG/uyXR5/+ibkUUQjnEv8Hmi2ZKRxUhC4ce z9VAXrXduUqimZZCQGW1Nbt/EhxOiQuJLF23bhPRwossHFlKUGL/jx1fQ029beTj4w4NgC P6lJAdNWehJZAvnsgyZFVS8t2L1nDg/rtzASUgMn2lyX7+fBNxzpiFvK93T/A5UTLU/gNM p3TFNTmtciNP9DYOmX3vcKcZ8nRuG3GGhR5XWAsc+UiJvXKs/+Da1yV8Q/ZyglOvXS5UtU AQkS7gDdZE8olQiu5pB5x7TUUhPZD9tsO1ZSHNGwRRQvnbZq2dIbFIy3uyJ2xA== 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 4Y1F5X1dJ7zfJ7; Sun, 1 Dec 2024 04:57:20 +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 4B14vKPF095675; Sun, 1 Dec 2024 04:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14vK8O095672; Sun, 1 Dec 2024 04:57:20 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:57:20 GMT Message-Id: <202412010457.4B14vK8O095672@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: f5641a80b7fd - stable/14 - x86: Remove invalid DEVMETHOD methods for leaf devices 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: f5641a80b7fd20935c3c76854f2561c72f5137a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f5641a80b7fd20935c3c76854f2561c72f5137a0 commit f5641a80b7fd20935c3c76854f2561c72f5137a0 Author: John Baldwin AuthorDate: 2024-11-01 14:10:30 +0000 Commit: John Baldwin CommitDate: 2024-12-01 02:46:07 +0000 x86: Remove invalid DEVMETHOD methods for leaf devices None of these drivers are for bus devices, so bus_generic_* is not appropriate. Most of these were nops except that detach would actually "succeed" (but not do any cleanup). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47374 (cherry picked from commit df615735960370255d3acc4ac2a6f4fd297b7461) --- sys/amd64/amd64/fpu.c | 4 ---- sys/i386/i386/npx.c | 4 ---- sys/x86/isa/atpic.c | 4 ---- sys/x86/isa/atrtc.c | 3 --- sys/x86/isa/clock.c | 3 --- sys/x86/isa/isa_dma.c | 4 ---- sys/x86/pci/pci_bus.c | 4 ---- sys/x86/x86/nexus.c | 4 ---- 8 files changed, 30 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 8a0666fc0614..fb0b74433eaa 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -1069,10 +1069,6 @@ static device_method_t fpupnp_methods[] = { /* Device interface */ DEVMETHOD(device_probe, fpupnp_probe), DEVMETHOD(device_attach, fpupnp_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 122452598f29..33d17b10574a 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -1341,10 +1341,6 @@ static device_method_t npxisa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, npxisa_probe), DEVMETHOD(device_attach, npxisa_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c index 556951d1b886..4ea80cfff7f9 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -599,10 +599,6 @@ static device_method_t atpic_methods[] = { /* Device interface */ DEVMETHOD(device_probe, atpic_probe), DEVMETHOD(device_attach, atpic_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c index df0acdd499be..63f41d866679 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -639,9 +639,6 @@ static device_method_t atrtc_isa_methods[] = { /* Device interface */ DEVMETHOD(device_probe, atrtc_probe), DEVMETHOD(device_attach, atrtc_isa_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), /* XXX stop statclock? */ DEVMETHOD(device_resume, atrtc_resume), diff --git a/sys/x86/isa/clock.c b/sys/x86/isa/clock.c index a0bf60159e78..0ceca41790ab 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -637,9 +637,6 @@ static device_method_t attimer_methods[] = { /* Device interface */ DEVMETHOD(device_probe, attimer_probe), DEVMETHOD(device_attach, attimer_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, attimer_resume), { 0, 0 } }; diff --git a/sys/x86/isa/isa_dma.c b/sys/x86/isa/isa_dma.c index 827e04d930ab..041527231ccf 100644 --- a/sys/x86/isa/isa_dma.c +++ b/sys/x86/isa/isa_dma.c @@ -589,10 +589,6 @@ static device_method_t atdma_methods[] = { /* Device interface */ DEVMETHOD(device_probe, atdma_probe), DEVMETHOD(device_attach, atdma_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c index d06cfca53673..ecca10dd2606 100644 --- a/sys/x86/pci/pci_bus.c +++ b/sys/x86/pci/pci_bus.c @@ -705,10 +705,6 @@ static device_method_t pcibus_pnp_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pcibus_pnp_probe), DEVMETHOD(device_attach, pcibus_pnp_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), { 0, 0 } }; diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c index 9b05758a6cbf..7e3ffb174559 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -747,10 +747,6 @@ static device_method_t sysresource_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sysresource_probe), DEVMETHOD(device_attach, sysresource_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD_END };