Date: Tue, 22 Nov 2011 21:56:55 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r227849 - in head/sys: arm/econa arm/xscale/ixp425 dev/ahci dev/ata dev/gpio dev/mvs dev/ppbus dev/ppc dev/siba dev/siis dev/usb/controller kern mips/atheros mips/cavium/usb mips/rmi mi... Message-ID: <201111222156.pAMLutas011772@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Tue Nov 22 21:56:55 2011 New Revision: 227849 URL: http://svn.freebsd.org/changeset/base/227849 Log: Rename device_delete_all_children() into device_delete_children(). Suggested by: jhb @ and marius @ MFC after: 1 week Modified: head/sys/arm/econa/ehci_ebus.c head/sys/arm/econa/ohci_ec.c head/sys/arm/xscale/ixp425/avila_ata.c head/sys/dev/ahci/ahci.c head/sys/dev/ata/ata-disk.c head/sys/dev/ata/ata-pci.c head/sys/dev/gpio/gpiobus.c head/sys/dev/mvs/mvs_pci.c head/sys/dev/mvs/mvs_soc.c head/sys/dev/ppbus/ppbconf.c head/sys/dev/ppc/ppc.c head/sys/dev/siba/siba_core.c head/sys/dev/siis/siis.c head/sys/dev/usb/controller/at91dci_atmelarm.c head/sys/dev/usb/controller/atmegadci_atmelarm.c head/sys/dev/usb/controller/ehci_ixp4xx.c head/sys/dev/usb/controller/ehci_mv.c head/sys/dev/usb/controller/ehci_pci.c head/sys/dev/usb/controller/musb_otg_atmelarm.c head/sys/dev/usb/controller/ohci_atmelarm.c head/sys/dev/usb/controller/ohci_pci.c head/sys/dev/usb/controller/ohci_s3c24x0.c head/sys/dev/usb/controller/uhci_pci.c head/sys/dev/usb/controller/uss820dci_atmelarm.c head/sys/dev/usb/controller/xhci_pci.c head/sys/kern/subr_bus.c head/sys/mips/atheros/ar71xx_ehci.c head/sys/mips/atheros/ar71xx_ohci.c head/sys/mips/cavium/usb/octusb_octeon.c head/sys/mips/rmi/xls_ehci.c head/sys/mips/rt305x/rt305x_dotg.c head/sys/sys/bus.h Modified: head/sys/arm/econa/ehci_ebus.c ============================================================================== --- head/sys/arm/econa/ehci_ebus.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/arm/econa/ehci_ebus.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/arm/econa/ohci_ec.c ============================================================================== --- head/sys/arm/econa/ohci_ec.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/arm/econa/ohci_ec.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/arm/xscale/ixp425/avila_ata.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_ata.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/arm/xscale/ixp425/avila_ata.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/ahci/ahci.c ============================================================================== --- head/sys/dev/ahci/ahci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/ahci/ahci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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++) { Modified: head/sys/dev/ata/ata-disk.c ============================================================================== --- head/sys/dev/ata/ata-disk.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/ata/ata-disk.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/ata/ata-pci.c ============================================================================== --- head/sys/dev/ata/ata-pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/ata/ata-pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/gpio/gpiobus.c ============================================================================== --- head/sys/dev/gpio/gpiobus.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/gpio/gpiobus.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/mvs/mvs_pci.c ============================================================================== --- head/sys/dev/mvs/mvs_pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/mvs/mvs_pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { Modified: head/sys/dev/mvs/mvs_soc.c ============================================================================== --- head/sys/dev/mvs/mvs_soc.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/mvs/mvs_soc.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { Modified: head/sys/dev/ppbus/ppbconf.c ============================================================================== --- head/sys/dev/ppbus/ppbconf.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/ppbus/ppbconf.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); } Modified: head/sys/dev/ppc/ppc.c ============================================================================== --- head/sys/dev/ppc/ppc.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/ppc/ppc.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/siba/siba_core.c ============================================================================== --- head/sys/dev/siba/siba_core.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/siba/siba_core.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); } Modified: head/sys/dev/siis/siis.c ============================================================================== --- head/sys/dev/siis/siis.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/siis/siis.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { Modified: head/sys/dev/usb/controller/at91dci_atmelarm.c ============================================================================== --- head/sys/dev/usb/controller/at91dci_atmelarm.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/at91dci_atmelarm.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/usb/controller/atmegadci_atmelarm.c ============================================================================== --- head/sys/dev/usb/controller/atmegadci_atmelarm.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/atmegadci_atmelarm.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/dev/usb/controller/ehci_ixp4xx.c ============================================================================== --- head/sys/dev/usb/controller/ehci_ixp4xx.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ehci_ixp4xx.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/dev/usb/controller/ehci_mv.c ============================================================================== --- head/sys/dev/usb/controller/ehci_mv.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ehci_mv.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- head/sys/dev/usb/controller/ehci_pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ehci_pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/usb/controller/musb_otg_atmelarm.c ============================================================================== --- head/sys/dev/usb/controller/musb_otg_atmelarm.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/musb_otg_atmelarm.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/dev/usb/controller/ohci_atmelarm.c ============================================================================== --- head/sys/dev/usb/controller/ohci_atmelarm.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ohci_atmelarm.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/dev/usb/controller/ohci_pci.c ============================================================================== --- head/sys/dev/usb/controller/ohci_pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ohci_pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/dev/usb/controller/ohci_s3c24x0.c ============================================================================== --- head/sys/dev/usb/controller/ohci_s3c24x0.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/ohci_s3c24x0.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/dev/usb/controller/uhci_pci.c ============================================================================== --- head/sys/dev/usb/controller/uhci_pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/uhci_pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/dev/usb/controller/uss820dci_atmelarm.c ============================================================================== --- head/sys/dev/usb/controller/uss820dci_atmelarm.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/uss820dci_atmelarm.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/dev/usb/controller/xhci_pci.c ============================================================================== --- head/sys/dev/usb/controller/xhci_pci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/dev/usb/controller/xhci_pci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/kern/subr_bus.c Tue Nov 22 21:56:55 2011 (r227849) @@ -1894,7 +1894,7 @@ device_delete_child(device_t dev, device * @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; Modified: head/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ehci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/mips/atheros/ar71xx_ehci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ohci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/mips/atheros/ar71xx_ohci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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 Modified: head/sys/mips/cavium/usb/octusb_octeon.c ============================================================================== --- head/sys/mips/cavium/usb/octusb_octeon.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/mips/cavium/usb/octusb_octeon.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/mips/rmi/xls_ehci.c ============================================================================== --- head/sys/mips/rmi/xls_ehci.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/mips/rmi/xls_ehci.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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); Modified: head/sys/mips/rt305x/rt305x_dotg.c ============================================================================== --- head/sys/mips/rt305x/rt305x_dotg.c Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/mips/rt305x/rt305x_dotg.c Tue Nov 22 21:56:55 2011 (r227849) @@ -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) { /* Modified: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Tue Nov 22 21:55:40 2011 (r227848) +++ head/sys/sys/bus.h Tue Nov 22 21:56:55 2011 (r227849) @@ -424,7 +424,7 @@ device_t device_add_child_ordered(device 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111222156.pAMLutas011772>