Remove now-redundant calls to device_delete_children
Earlier calls to bus_generic_detach now take care of deleting children. Differential Revision: https://reviews.freebsd.org/D47962
This commit is contained in:
@@ -965,7 +965,7 @@ cpsw_detach(device_t dev)
|
||||
if (error != 0)
|
||||
return (error);
|
||||
|
||||
return (device_delete_children(dev));
|
||||
return (0);
|
||||
}
|
||||
|
||||
static phandle_t
|
||||
|
||||
@@ -245,8 +245,6 @@ cardbus_detach_card(device_t cbdev)
|
||||
|
||||
bus_topo_lock();
|
||||
err = bus_generic_detach(cbdev);
|
||||
if (err == 0)
|
||||
err = device_delete_children(cbdev);
|
||||
bus_topo_unlock();
|
||||
if (err)
|
||||
return (err);
|
||||
|
||||
@@ -2814,7 +2814,6 @@ cxgbe_detach(device_t dev)
|
||||
rc = bus_generic_detach(dev);
|
||||
if (rc)
|
||||
return (rc);
|
||||
device_delete_children(dev);
|
||||
|
||||
sysctl_ctx_free(&pi->ctx);
|
||||
begin_vi_detach(sc, &pi->vi[0]);
|
||||
|
||||
@@ -292,7 +292,7 @@ dpaa2_mc_detach(device_t dev)
|
||||
if (dinfo)
|
||||
free(dinfo, M_DPAA2_MC);
|
||||
|
||||
return (device_delete_children(dev));
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -114,7 +114,7 @@ dpaa2_rc_detach(device_t dev)
|
||||
if (dinfo)
|
||||
free(dinfo, M_DPAA2_RC);
|
||||
|
||||
return (device_delete_children(dev));
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -315,16 +315,10 @@ gpiobus_attach_bus(device_t dev)
|
||||
int
|
||||
gpiobus_detach_bus(device_t dev)
|
||||
{
|
||||
int err;
|
||||
|
||||
#ifdef FDT
|
||||
ofw_gpiobus_unregister_provider(dev);
|
||||
#endif
|
||||
err = bus_generic_detach(dev);
|
||||
if (err != 0)
|
||||
return (err);
|
||||
|
||||
return (device_delete_children(dev));
|
||||
return (bus_generic_detach(dev));
|
||||
}
|
||||
|
||||
int
|
||||
@@ -584,8 +578,6 @@ gpiobus_detach(device_t dev)
|
||||
|
||||
if ((err = bus_detach_children(dev)) != 0)
|
||||
return (err);
|
||||
if ((err = device_delete_children(dev)) != 0)
|
||||
return (err);
|
||||
|
||||
rman_fini(&sc->sc_intr_rman);
|
||||
if (sc->sc_pins) {
|
||||
|
||||
@@ -297,8 +297,7 @@ hidbus_detach_children(device_t dev)
|
||||
|
||||
if (is_bus) {
|
||||
/* If hidbus is passed, delete all children. */
|
||||
bus_generic_detach(bus);
|
||||
device_delete_children(bus);
|
||||
error = bus_generic_detach(bus);
|
||||
} else {
|
||||
/*
|
||||
* If hidbus child is passed, delete all hidbus children
|
||||
|
||||
@@ -346,9 +346,6 @@ ida_detach(device_t dev)
|
||||
ida = (struct ida_softc *)device_get_softc(dev);
|
||||
|
||||
error = bus_generic_detach(dev);
|
||||
if (error)
|
||||
return (error);
|
||||
error = device_delete_children(dev);
|
||||
if (error)
|
||||
return (error);
|
||||
|
||||
|
||||
@@ -50,7 +50,6 @@ iicoc_detach(device_t dev)
|
||||
struct iicoc_softc *sc;
|
||||
|
||||
sc = device_get_softc(dev);
|
||||
device_delete_children(dev);
|
||||
bus_generic_detach(dev);
|
||||
bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid, sc->mem_res);
|
||||
mtx_destroy(&sc->sc_mtx);
|
||||
|
||||
@@ -166,7 +166,6 @@ iicsmb_detach(device_t dev)
|
||||
struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev);
|
||||
|
||||
bus_generic_detach(dev);
|
||||
device_delete_children(dev);
|
||||
mtx_destroy(&sc->lock);
|
||||
|
||||
return (0);
|
||||
|
||||
@@ -206,7 +206,6 @@ nvdimm_root_detach(device_t dev)
|
||||
{
|
||||
struct nvdimm_root_dev *root;
|
||||
struct SPA_mapping *spa, *next;
|
||||
int error;
|
||||
|
||||
root = device_get_softc(dev);
|
||||
SLIST_FOREACH_SAFE(spa, &root->spas, link, next) {
|
||||
@@ -215,11 +214,7 @@ nvdimm_root_detach(device_t dev)
|
||||
SLIST_REMOVE_HEAD(&root->spas, link);
|
||||
free(spa, M_NVDIMM_ACPI);
|
||||
}
|
||||
error = bus_generic_detach(dev);
|
||||
if (error != 0)
|
||||
return (error);
|
||||
error = device_delete_children(dev);
|
||||
return (error);
|
||||
return (bus_generic_detach(dev));
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
+1
-3
@@ -4510,9 +4510,7 @@ pci_detach(device_t dev)
|
||||
return (error);
|
||||
sc = device_get_softc(dev);
|
||||
error = bus_release_resource(dev, PCI_RES_BUS, 0, sc->sc_bus);
|
||||
if (error)
|
||||
return (error);
|
||||
return (device_delete_children(dev));
|
||||
return (error);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@@ -740,7 +740,6 @@ superio_detach(device_t dev)
|
||||
return (error);
|
||||
if (sc->chardev != NULL)
|
||||
destroy_dev(sc->chardev);
|
||||
device_delete_children(dev);
|
||||
bus_release_resource(dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res);
|
||||
mtx_destroy(&sc->conf_lock);
|
||||
return (0);
|
||||
|
||||
@@ -1345,7 +1345,6 @@ cp2112iic_detach(device_t dev)
|
||||
err = bus_generic_detach(dev);
|
||||
if (err != 0)
|
||||
return (err);
|
||||
device_delete_children(dev);
|
||||
|
||||
mtx_lock(&sc->io.lock);
|
||||
usbd_transfer_stop(sc->xfers[CP2112_INTR_IN]);
|
||||
|
||||
@@ -193,7 +193,6 @@ i2ctinyusb_detach(device_t dev)
|
||||
err = bus_generic_detach(dev);
|
||||
if (err != 0)
|
||||
return (err);
|
||||
device_delete_children(dev);
|
||||
|
||||
mtx_destroy(&sc->sc_mtx);
|
||||
|
||||
|
||||
@@ -399,9 +399,6 @@ vmd_detach(device_t dev)
|
||||
int error;
|
||||
|
||||
error = bus_generic_detach(dev);
|
||||
if (error)
|
||||
return (error);
|
||||
error = device_delete_children(dev);
|
||||
if (error)
|
||||
return (error);
|
||||
if (sc->vmd_msix_count == 0)
|
||||
|
||||
Reference in New Issue
Block a user