Page MenuHomeFreeBSD
Files F150493724

D47957.diff
No OneTemporary
Actions

D47957.diff
View Options

diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c
--- a/sys/arm/nvidia/tegra_sdhci.c
+++ b/sys/arm/nvidia/tegra_sdhci.c
@@ -418,7 +418,7 @@
struct tegra_sdhci_softc *sc = device_get_softc(dev);
struct sdhci_slot *slot = &sc->slot;
- bus_generic_detach(dev);
+ bus_detach_children(dev);
sdhci_fdt_gpio_teardown(sc->gpio);
clk_release(sc->clk);
bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie);
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -729,7 +729,7 @@
/*
* Make sure all child devices are gone.
*/
- bus_generic_detach(sc->dev);
+ bus_detach_children(sc->dev);
for (i = 0; i < (sc)->params.nports; i++) {
if (sc->portdev[i] &&
device_delete_child(sc->dev, sc->portdev[i]) != 0)
@@ -1066,7 +1066,7 @@
/*
* cxgb_port_detach() is called via the device_detach methods when
- * cxgb_free() calls the bus_generic_detach. It is responsible for
+ * cxgb_free() calls the bus_detach_children. It is responsible for
* removing the device from the view of the kernel, i.e. from all
* interfaces lists etc. This routine is only called when the driver is
* being unloaded, not when the link goes down.
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1789,7 +1789,7 @@
}
if (device_is_attached(dev)) {
- rc = bus_generic_detach(dev);
+ rc = bus_detach_children(dev);
if (rc) {
device_printf(dev,
"failed to detach child devices: %d\n", rc);
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -582,7 +582,7 @@
("gpiobus mutex not initialized"));
GPIOBUS_LOCK_DESTROY(sc);
- if ((err = bus_generic_detach(dev)) != 0)
+ if ((err = bus_detach_children(dev)) != 0)
return (err);
if ((err = device_delete_children(dev)) != 0)
return (err);
diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c
--- a/sys/dev/gpio/gpioiic.c
+++ b/sys/dev/gpio/gpioiic.c
@@ -331,7 +331,7 @@
struct gpioiic_softc *sc = device_get_softc(dev);
int err;
- if ((err = bus_generic_detach(dev)) != 0)
+ if ((err = bus_detach_children(dev)) != 0)
return (err);
gpioiic_cleanup(sc);
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -1552,7 +1552,7 @@
int error;
sc = device_get_softc(dev);
- error = bus_generic_detach(dev);
+ error = bus_detach_children(dev);
if (error)
return (error);
#ifdef PCI_HP
diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c
--- a/sys/dev/sdhci/sdhci_fdt.c
+++ b/sys/dev/sdhci/sdhci_fdt.c
@@ -666,7 +666,7 @@
struct sdhci_fdt_softc *sc = device_get_softc(dev);
int i;
- bus_generic_detach(dev);
+ bus_detach_children(dev);
bus_teardown_intr(dev, sc->irq_res, sc->intrhand);
bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res),
sc->irq_res);
diff --git a/sys/dev/sdhci/sdhci_xenon.c b/sys/dev/sdhci/sdhci_xenon.c
--- a/sys/dev/sdhci/sdhci_xenon.c
+++ b/sys/dev/sdhci/sdhci_xenon.c
@@ -592,7 +592,7 @@
{
struct sdhci_xenon_softc *sc = device_get_softc(dev);
- bus_generic_detach(dev);
+ bus_detach_children(dev);
bus_teardown_intr(dev, sc->irq_res, sc->intrhand);
bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->irq_res),
sc->irq_res);

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 4:59 PM (59 m, 37 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30730565
Default Alt Text
D47957.diff (3 KB)

Event Timeline