git: f5641a80b7fd - stable/14 - x86: Remove invalid DEVMETHOD methods for leaf devices

The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=f5641a80b7fd20935c3c76854f2561c72f5137a0

commit f5641a80b7fd20935c3c76854f2561c72f5137a0
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-11-01 14:10:30 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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
 };