diff options
Diffstat (limited to 'sys')
32 files changed, 32 insertions, 32 deletions
diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/econa/ehci_ebus.c index 8403da9..ee20148 100644 --- a/sys/arm/econa/ehci_ebus.c +++ b/sys/arm/econa/ehci_ebus.c @@ -235,7 +235,7 @@ ehci_ebus_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); /* * disable interrupts that might have been switched on in diff --git a/sys/arm/econa/ohci_ec.c b/sys/arm/econa/ohci_ec.c index 5d103a3..ee44960 100644 --- a/sys/arm/econa/ohci_ec.c +++ b/sys/arm/econa/ohci_ec.c @@ -185,7 +185,7 @@ ohci_ec_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl, OHCI_CONTROL, 0); diff --git a/sys/arm/xscale/ixp425/avila_ata.c b/sys/arm/xscale/ixp425/avila_ata.c index 7194d03..3c9efe8 100644 --- a/sys/arm/xscale/ixp425/avila_ata.c +++ b/sys/arm/xscale/ixp425/avila_ata.c @@ -263,7 +263,7 @@ ata_avila_detach(device_t dev) /* XXX quiesce gpio? */ /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq); diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 6aa131c..afa4b99 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -518,7 +518,7 @@ ahci_detach(device_t dev) int i; /* Detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); /* Free interrupts. */ for (i = 0; i < ctlr->numirqs; i++) { diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index c872f62..a45221a 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -181,7 +181,7 @@ ad_detach(device_t dev) callout_drain(&atadev->spindown_timer); /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); /* destroy disk from the system so we don't get any further requests */ disk_destroy(adp->disk); diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 9fcd003..f838d79 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -138,7 +138,7 @@ ata_pci_detach(device_t dev) struct ata_pci_controller *ctlr = device_get_softc(dev); /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); if (ctlr->r_irq) { bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle); diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 7167daa..09ebe4e 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -229,7 +229,7 @@ gpiobus_detach(device_t dev) return (err); /* detach and delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_pins_mapped) { free(sc->sc_pins_mapped, M_DEVBUF); diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c index 36dd93d..7379522 100644 --- a/sys/dev/mvs/mvs_pci.c +++ b/sys/dev/mvs/mvs_pci.c @@ -179,7 +179,7 @@ mvs_detach(device_t dev) struct mvs_controller *ctlr = device_get_softc(dev); /* Detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); /* Free interrupt. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c index 670bfec..9c5c479 100644 --- a/sys/dev/mvs/mvs_soc.c +++ b/sys/dev/mvs/mvs_soc.c @@ -175,7 +175,7 @@ mvs_detach(device_t dev) struct mvs_controller *ctlr = device_get_softc(dev); /* Detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); /* Free interrupt. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c index 858e5b2..65a26e0 100644 --- a/sys/dev/ppbus/ppbconf.c +++ b/sys/dev/ppbus/ppbconf.c @@ -429,7 +429,7 @@ ppbus_detach(device_t dev) return (error); /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); return (0); } diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c index ef505d8..5da180c 100644 --- a/sys/dev/ppc/ppc.c +++ b/sys/dev/ppc/ppc.c @@ -1857,7 +1857,7 @@ ppc_detach(device_t dev) } /* detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); if (ppc->res_irq != 0) { bus_teardown_intr(dev, ppc->res_irq, ppc->intr_cookie); diff --git a/sys/dev/siba/siba_core.c b/sys/dev/siba/siba_core.c index 61652ad..4c7dfee 100644 --- a/sys/dev/siba/siba_core.c +++ b/sys/dev/siba/siba_core.c @@ -215,7 +215,7 @@ int siba_core_detach(struct siba_softc *siba) { /* detach & delete all children */ - device_delete_all_children(siba->siba_dev); + device_delete_children(siba->siba_dev); return (0); } diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 40c17cb..17c1a39 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -207,7 +207,7 @@ siis_detach(device_t dev) struct siis_controller *ctlr = device_get_softc(dev); /* Detach & delete all children */ - device_delete_all_children(dev); + device_delete_children(dev); /* Free interrupts. */ if (ctlr->irq.r_irq) { diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c index 822b5ce..1e8e394 100644 --- a/sys/dev/usb/controller/at91dci_atmelarm.c +++ b/sys/dev/usb/controller/at91dci_atmelarm.c @@ -271,7 +271,7 @@ at91_udp_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); /* disable Transceiver */ AT91_UDP_WRITE_4(&sc->sc_dci, AT91_UDP_TXVC, AT91_UDP_TXVC_DIS); diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c index ed766d0..c68101c 100644 --- a/sys/dev/usb/controller/atmegadci_atmelarm.c +++ b/sys/dev/usb/controller/atmegadci_atmelarm.c @@ -164,7 +164,7 @@ atmegadci_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 7f7cde8..7327fde 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -257,7 +257,7 @@ ehci_ixp_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index 90dc2b0..f12cb14 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -289,7 +289,7 @@ mv_ehci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); /* * disable interrupts that might have been switched on in mv_ehci_attach diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 25ccc6f..8c19b2a 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -498,7 +498,7 @@ ehci_pci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); pci_disable_busmaster(self); diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c index 37522f8..b301e09 100644 --- a/sys/dev/usb/controller/musb_otg_atmelarm.c +++ b/sys/dev/usb/controller/musb_otg_atmelarm.c @@ -189,7 +189,7 @@ musbotg_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c index 122f705..177c926 100644 --- a/sys/dev/usb/controller/ohci_atmelarm.c +++ b/sys/dev/usb/controller/ohci_atmelarm.c @@ -174,7 +174,7 @@ ohci_atmelarm_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); /* * Put the controller into reset, then disable clocks and do diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index f7fa273..c8690c9 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -348,7 +348,7 @@ ohci_pci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); pci_disable_busmaster(self); diff --git a/sys/dev/usb/controller/ohci_s3c24x0.c b/sys/dev/usb/controller/ohci_s3c24x0.c index 480d040..b0907ad 100644 --- a/sys/dev/usb/controller/ohci_s3c24x0.c +++ b/sys/dev/usb/controller/ohci_s3c24x0.c @@ -156,7 +156,7 @@ ohci_s3c24x0_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); /* * Put the controller into reset, then disable clocks and do diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index b3fa7a1..4b04f25 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -406,7 +406,7 @@ uhci_pci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); /* * disable interrupts that might have been switched on in diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c index f40f0f5..e3742b8 100644 --- a/sys/dev/usb/controller/uss820dci_atmelarm.c +++ b/sys/dev/usb/controller/uss820dci_atmelarm.c @@ -221,7 +221,7 @@ uss820_atmelarm_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index f25c88e..75b3af8 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -242,7 +242,7 @@ xhci_pci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); pci_disable_busmaster(self); diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 605f772..c65fda1 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1894,7 +1894,7 @@ device_delete_child(device_t dev, device_t child) * @retval non-zero a device would not detach */ int -device_delete_all_children(device_t dev) +device_delete_children(device_t dev) { device_t child; int error; diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c index 7d2c1cc..1f24d7c 100644 --- a/sys/mips/atheros/ar71xx_ehci.c +++ b/sys/mips/atheros/ar71xx_ehci.c @@ -244,7 +244,7 @@ ar71xx_ehci_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); if (sc->sc_irq_res && sc->sc_intr_hdl) { /* diff --git a/sys/mips/atheros/ar71xx_ohci.c b/sys/mips/atheros/ar71xx_ohci.c index 4ccd8c2..9e0a63f 100644 --- a/sys/mips/atheros/ar71xx_ohci.c +++ b/sys/mips/atheros/ar71xx_ohci.c @@ -150,7 +150,7 @@ ar71xx_ohci_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); /* * Put the controller into reset, then disable clocks and do diff --git a/sys/mips/cavium/usb/octusb_octeon.c b/sys/mips/cavium/usb/octusb_octeon.c index ac7b590..d160eda 100644 --- a/sys/mips/cavium/usb/octusb_octeon.c +++ b/sys/mips/cavium/usb/octusb_octeon.c @@ -160,7 +160,7 @@ octusb_octeon_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_dci.sc_irq_res && sc->sc_dci.sc_intr_hdl) { /* diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c index b0360f3..4870872 100644 --- a/sys/mips/rmi/xls_ehci.c +++ b/sys/mips/rmi/xls_ehci.c @@ -214,7 +214,7 @@ ehci_xls_detach(device_t self) device_delete_child(self, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(self); + device_delete_children(self); if (sc->sc_irq_res && sc->sc_intr_hdl) { ehci_detach(sc); diff --git a/sys/mips/rt305x/rt305x_dotg.c b/sys/mips/rt305x/rt305x_dotg.c index 144f3ad..67666f7 100644 --- a/sys/mips/rt305x/rt305x_dotg.c +++ b/sys/mips/rt305x/rt305x_dotg.c @@ -176,7 +176,7 @@ dotg_obio_detach(device_t dev) device_delete_child(dev, bdev); } /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); + device_delete_children(dev); if (sc->sc_dci.sc_irq_res && sc->sc_dci.sc_intr_hdl) { /* diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 6636843..1c16bd6 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -424,7 +424,7 @@ device_t device_add_child_ordered(device_t dev, u_int order, const char *name, int unit); void device_busy(device_t dev); int device_delete_child(device_t dev, device_t child); -int device_delete_all_children(device_t dev); +int device_delete_children(device_t dev); int device_attach(device_t dev); int device_detach(device_t dev); void device_disable(device_t dev); |
