Date: Sun, 1 Dec 2024 04:58:07 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1c3c574f8483 - stable/13 - x86: Remove invalid DEVMETHOD methods for leaf devices Message-ID: <202412010458.4B14w79s097992@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1c3c574f8483c597ab62f7acacf01271b2f86c3a commit 1c3c574f8483c597ab62f7acacf01271b2f86c3a Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2024-11-01 14:10:30 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2024-11-30 21:46:42 +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 3f06033ae89a..256bd83e720e 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -1091,10 +1091,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 09abf7c17438..91904d70c4a2 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -1365,10 +1365,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 07c3b42e5d8d..3097d8eb67b5 100644 --- a/sys/x86/isa/atpic.c +++ b/sys/x86/isa/atpic.c @@ -598,10 +598,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 668834307eb2..7fe0402de791 100644 --- a/sys/x86/isa/atrtc.c +++ b/sys/x86/isa/atrtc.c @@ -636,9 +636,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 05296b5849ad..cbd6b59580c5 100644 --- a/sys/x86/isa/clock.c +++ b/sys/x86/isa/clock.c @@ -644,9 +644,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 5415d05febc5..d0e9bf736263 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 40136be72f6d..ac8a00139eff 100644 --- a/sys/x86/pci/pci_bus.c +++ b/sys/x86/pci/pci_bus.c @@ -707,10 +707,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 08875d498e53..18fc28428891 100644 --- a/sys/x86/x86/nexus.c +++ b/sys/x86/x86/nexus.c @@ -887,10 +887,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 };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412010458.4B14w79s097992>