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
bsdjhb · Nov 1, 2024 · df61573 · df61573
1 parent 84553cc
commit df61573
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 30 deletions.
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
@@ -1066,10 +1066,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
@@ -1339,10 +1339,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
@@ -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
@@ -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
@@ -635,9 +635,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
@@ -581,10 +581,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
@@ -712,10 +712,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
@@ -761,10 +761,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
 };