d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename device_delete_all_children() into device_delete_children().

Browse Source 
Suggested by:	jhb @ and marius @
MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2011-11-22 21:56:55 +00:00
parent 848e30ff51
commit 3b12bdb58f
32 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/econa/ehci_ebus.c
View File

@ -235,7 +235,7 @@ ehci_ebus_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * disable interrupts that might have been switched on in

2
sys/arm/econa/ohci_ec.c
View File

@ -185,7 +185,7 @@ ohci_ec_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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, bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl,
OHCI_CONTROL, 0); OHCI_CONTROL, 0);

2
sys/arm/xscale/ixp425/avila_ata.c
View File

@ -263,7 +263,7 @@ ata_avila_detach(device_t dev)
/* XXX quiesce gpio? */ /* XXX quiesce gpio? */
/* detach & delete all children */ /* detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih); bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih);
bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq);

2
sys/dev/ahci/ahci.c
View File

@ -518,7 +518,7 @@ ahci_detach(device_t dev)
int i; int i;
/* Detach & delete all children */ /* Detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
/* Free interrupts. */ /* Free interrupts. */
for (i = 0; i < ctlr->numirqs; i++) { for (i = 0; i < ctlr->numirqs; i++) {

2
sys/dev/ata/ata-disk.c
View File

@ -181,7 +181,7 @@ ad_detach(device_t dev)
callout_drain(&atadev->spindown_timer); callout_drain(&atadev->spindown_timer);
/* detach & delete all children */ /* 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 */ /* destroy disk from the system so we don't get any further requests */
disk_destroy(adp->disk); disk_destroy(adp->disk);

2
sys/dev/ata/ata-pci.c
View File

@ -138,7 +138,7 @@ ata_pci_detach(device_t dev)
struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_pci_controller *ctlr = device_get_softc(dev);
/* detach & delete all children */ /* detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
if (ctlr->r_irq) { if (ctlr->r_irq) {
bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle); bus_teardown_intr(dev, ctlr->r_irq, ctlr->handle);

2
sys/dev/gpio/gpiobus.c
View File

@ -229,7 +229,7 @@ gpiobus_detach(device_t dev)
return (err); return (err);
/* detach and delete all children */ /* detach and delete all children */
device_delete_all_children(dev); device_delete_children(dev);
if (sc->sc_pins_mapped) { if (sc->sc_pins_mapped) {
free(sc->sc_pins_mapped, M_DEVBUF); free(sc->sc_pins_mapped, M_DEVBUF);

2
sys/dev/mvs/mvs_pci.c
View File

@ -179,7 +179,7 @@ mvs_detach(device_t dev)
struct mvs_controller *ctlr = device_get_softc(dev); struct mvs_controller *ctlr = device_get_softc(dev);
/* Detach & delete all children */ /* Detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
/* Free interrupt. */ /* Free interrupt. */
if (ctlr->irq.r_irq) { if (ctlr->irq.r_irq) {

2
sys/dev/mvs/mvs_soc.c
View File

@ -175,7 +175,7 @@ mvs_detach(device_t dev)
struct mvs_controller *ctlr = device_get_softc(dev); struct mvs_controller *ctlr = device_get_softc(dev);
/* Detach & delete all children */ /* Detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
/* Free interrupt. */ /* Free interrupt. */
if (ctlr->irq.r_irq) { if (ctlr->irq.r_irq) {

2
sys/dev/ppbus/ppbconf.c
View File

@ -429,7 +429,7 @@ ppbus_detach(device_t dev)
return (error); return (error);
/* detach & delete all children */ /* detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
return (0); return (0);
} }

2
sys/dev/ppc/ppc.c
View File

@ -1857,7 +1857,7 @@ ppc_detach(device_t dev)
} }
/* detach & delete all children */ /* detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
if (ppc->res_irq != 0) { if (ppc->res_irq != 0) {
bus_teardown_intr(dev, ppc->res_irq, ppc->intr_cookie); bus_teardown_intr(dev, ppc->res_irq, ppc->intr_cookie);

2
sys/dev/siba/siba_core.c
View File

@ -215,7 +215,7 @@ int
siba_core_detach(struct siba_softc *siba) siba_core_detach(struct siba_softc *siba)
{ {
/* detach & delete all children */ /* detach & delete all children */
device_delete_all_children(siba->siba_dev); device_delete_children(siba->siba_dev);
return (0); return (0);
} }

2
sys/dev/siis/siis.c
View File

@ -207,7 +207,7 @@ siis_detach(device_t dev)
struct siis_controller *ctlr = device_get_softc(dev); struct siis_controller *ctlr = device_get_softc(dev);
/* Detach & delete all children */ /* Detach & delete all children */
device_delete_all_children(dev); device_delete_children(dev);
/* Free interrupts. */ /* Free interrupts. */
if (ctlr->irq.r_irq) { if (ctlr->irq.r_irq) {

2
sys/dev/usb/controller/at91dci_atmelarm.c
View File

@ -271,7 +271,7 @@ at91_udp_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* during module unload there are lots of children leftover */
device_delete_all_children(dev); device_delete_children(dev);
/* disable Transceiver */ /* disable Transceiver */
AT91_UDP_WRITE_4(&sc->sc_dci, AT91_UDP_TXVC, AT91_UDP_TXVC_DIS); AT91_UDP_WRITE_4(&sc->sc_dci, AT91_UDP_TXVC, AT91_UDP_TXVC_DIS);

2
sys/dev/usb/controller/atmegadci_atmelarm.c
View File

@ -164,7 +164,7 @@ atmegadci_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) {
/* /*

2
sys/dev/usb/controller/ehci_ixp4xx.c
View File

@ -257,7 +257,7 @@ ehci_ixp_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_irq_res && sc->sc_intr_hdl) {
/* /*

2
sys/dev/usb/controller/ehci_mv.c
View File

@ -289,7 +289,7 @@ mv_ehci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * disable interrupts that might have been switched on in mv_ehci_attach

2
sys/dev/usb/controller/ehci_pci.c
View File

@ -498,7 +498,7 @@ ehci_pci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* during module unload there are lots of children leftover */
device_delete_all_children(self); device_delete_children(self);
pci_disable_busmaster(self); pci_disable_busmaster(self);

2
sys/dev/usb/controller/musb_otg_atmelarm.c
View File

@ -189,7 +189,7 @@ musbotg_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) {
/* /*

2
sys/dev/usb/controller/ohci_atmelarm.c
View File

@ -174,7 +174,7 @@ ohci_atmelarm_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * Put the controller into reset, then disable clocks and do

2
sys/dev/usb/controller/ohci_pci.c
View File

@ -348,7 +348,7 @@ ohci_pci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* during module unload there are lots of children leftover */
device_delete_all_children(self); device_delete_children(self);
pci_disable_busmaster(self); pci_disable_busmaster(self);

2
sys/dev/usb/controller/ohci_s3c24x0.c
View File

@ -156,7 +156,7 @@ ohci_s3c24x0_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * Put the controller into reset, then disable clocks and do

2
sys/dev/usb/controller/uhci_pci.c
View File

@ -406,7 +406,7 @@ uhci_pci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * disable interrupts that might have been switched on in

2
sys/dev/usb/controller/uss820dci_atmelarm.c
View File

@ -221,7 +221,7 @@ uss820_atmelarm_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_irq_res && sc->sc_intr_hdl) {
/* /*

2
sys/dev/usb/controller/xhci_pci.c
View File

@ -242,7 +242,7 @@ xhci_pci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* during module unload there are lots of children leftover */
device_delete_all_children(self); device_delete_children(self);
pci_disable_busmaster(self); pci_disable_busmaster(self);

2
sys/kern/subr_bus.c
View File

@ -1894,7 +1894,7 @@ device_delete_child(device_t dev, device_t child)
* @retval non-zero a device would not detach * @retval non-zero a device would not detach
*/ */
int int
device_delete_all_children(device_t dev) device_delete_children(device_t dev)
{ {
device_t child; device_t child;
int error; int error;

2
sys/mips/atheros/ar71xx_ehci.c
View File

@ -244,7 +244,7 @@ ar71xx_ehci_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_irq_res && sc->sc_intr_hdl) {
/* /*

2
sys/mips/atheros/ar71xx_ohci.c
View File

@ -150,7 +150,7 @@ ar71xx_ohci_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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 * Put the controller into reset, then disable clocks and do

2
sys/mips/cavium/usb/octusb_octeon.c
View File

@ -160,7 +160,7 @@ octusb_octeon_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_dci.sc_irq_res && sc->sc_dci.sc_intr_hdl) {
/* /*

2
sys/mips/rmi/xls_ehci.c
View File

@ -214,7 +214,7 @@ ehci_xls_detach(device_t self)
device_delete_child(self, bdev); device_delete_child(self, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_irq_res && sc->sc_intr_hdl) {
ehci_detach(sc); ehci_detach(sc);

2
sys/mips/rt305x/rt305x_dotg.c
View File

@ -176,7 +176,7 @@ dotg_obio_detach(device_t dev)
device_delete_child(dev, bdev); device_delete_child(dev, bdev);
} }
/* during module unload there are lots of children leftover */ /* 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) { if (sc->sc_dci.sc_irq_res && sc->sc_dci.sc_intr_hdl) {
/* /*

2
sys/sys/bus.h
View File

@ -424,7 +424,7 @@ device_t device_add_child_ordered(device_t dev, u_int order,
const char *name, int unit); const char *name, int unit);
void device_busy(device_t dev); void device_busy(device_t dev);
int device_delete_child(device_t dev, device_t child); 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_attach(device_t dev);
int device_detach(device_t dev); int device_detach(device_t dev);
void device_disable(device_t dev); void device_disable(device_t dev);