Page MenuHomeFreeBSD
Files F153269815

D47971.id148693.diff
No OneTemporary
Actions

D47971.id148693.diff
View Options

diff --git a/sys/dev/spibus/acpi_spibus.c b/sys/dev/spibus/acpi_spibus.c
--- a/sys/dev/spibus/acpi_spibus.c
+++ b/sys/dev/spibus/acpi_spibus.c
@@ -394,7 +394,7 @@
{
acpi_spibus_set_power_children(dev, ACPI_STATE_D3, false);
- return (spibus_detach(dev));
+ return (bus_generic_detach(dev));
}
static int
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -61,29 +61,6 @@
return (0);
}
-/*
- * Since this is not a self-enumerating bus, and since we always add
- * children in attach, we have to always delete children here.
- */
-int
-spibus_detach(device_t dev)
-{
- return (bus_generic_detach(dev));
-}
-
-static int
-spibus_suspend(device_t dev)
-{
- return (bus_generic_suspend(dev));
-}
-
-static
-int
-spibus_resume(device_t dev)
-{
- return (bus_generic_resume(dev));
-}
-
static int
spibus_print_child(device_t dev, device_t child)
{
@@ -257,10 +234,10 @@
/* Device interface */
DEVMETHOD(device_probe, spibus_probe),
DEVMETHOD(device_attach, spibus_attach),
- DEVMETHOD(device_detach, spibus_detach),
+ DEVMETHOD(device_detach, bus_generic_detach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
- DEVMETHOD(device_suspend, spibus_suspend),
- DEVMETHOD(device_resume, spibus_resume),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h
--- a/sys/dev/spibus/spibusvar.h
+++ b/sys/dev/spibus/spibusvar.h
@@ -77,7 +77,6 @@
extern driver_t ofw_spibus_driver;
int spibus_attach(device_t);
-int spibus_detach(device_t);
device_t spibus_add_child_common(device_t, u_int, const char *, int, size_t);
void spibus_child_deleted(device_t, device_t);
void spibus_probe_nomatch(device_t, device_t);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 4:13 AM (9 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31887375
Default Alt Text
D47971.id148693.diff (1 KB)

Event Timeline