diff options
Diffstat (limited to 'sys/dev/aacraid')
| -rw-r--r-- | sys/dev/aacraid/aacraid.c | 15 | ||||
| -rw-r--r-- | sys/dev/aacraid/aacraid_debug.c | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c index 031a13ef021b..90a073d10039 100644 --- a/sys/dev/aacraid/aacraid.c +++ b/sys/dev/aacraid/aacraid.c @@ -335,7 +335,7 @@ aacraid_attach(struct aac_softc *sc) aac_get_bus_info(sc); /* poke the bus to actually attach the child devices */ - bus_generic_attach(sc->aac_dev); + bus_attach_children(sc->aac_dev); /* mark the controller up */ sc->aac_state &= ~AAC_STATE_SUSPEND; @@ -739,6 +739,10 @@ aacraid_detach(device_t dev) sc = device_get_softc(dev); fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); + error = bus_generic_detach(dev); + if (error != 0) + return (error); + callout_drain(&sc->aac_daemontime); /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { @@ -749,9 +753,6 @@ aacraid_detach(device_t dev) /* Remove the CAM SIMs */ while ((sim = TAILQ_FIRST(&sc->aac_sim_tqh)) != NULL) { TAILQ_REMOVE(&sc->aac_sim_tqh, sim, sim_link); - error = device_delete_child(dev, sim->sim_dev); - if (error) - return (error); free(sim, M_AACRAIDBUF); } @@ -3608,7 +3609,7 @@ aac_container_bus(struct aac_softc *sc) "No memory to add container bus\n"); panic("Out of memory?!"); } - child = device_add_child(sc->aac_dev, "aacraidp", -1); + child = device_add_child(sc->aac_dev, "aacraidp", DEVICE_UNIT_ANY); if (child == NULL) { device_printf(sc->aac_dev, "device_add_child failed for container bus\n"); @@ -3631,7 +3632,7 @@ aac_container_bus(struct aac_softc *sc) device_set_desc(child, aac_describe_code(aac_container_types, mir->MntTable[0].VolType)); */ - bus_generic_attach(sc->aac_dev); + bus_attach_children(sc->aac_dev); } static void @@ -3725,7 +3726,7 @@ aac_get_bus_info(struct aac_softc *sc) break; } - child = device_add_child(sc->aac_dev, "aacraidp", -1); + child = device_add_child(sc->aac_dev, "aacraidp", DEVICE_UNIT_ANY); if (child == NULL) { device_printf(sc->aac_dev, "device_add_child failed for passthrough bus %d\n", diff --git a/sys/dev/aacraid/aacraid_debug.c b/sys/dev/aacraid/aacraid_debug.c index 0000e7d070a8..ca008cc082fc 100644 --- a/sys/dev/aacraid/aacraid_debug.c +++ b/sys/dev/aacraid/aacraid_debug.c @@ -51,13 +51,12 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> - #include <sys/bus.h> #include <sys/rman.h> +#include <sys/stdarg.h> #include <machine/resource.h> #include <machine/bus.h> -#include <machine/stdarg.h> #include <dev/aacraid/aacraid_debug.h> |