2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
index 649027038659..2423d2b87272 100644
--- a/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
+++ b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c
@@ -119,7 +119,7 @@ iicoc_attach(device_t dev)
 	sc->i2cfreq = XLP_I2C_FREQ;
 	iicoc_init(dev);
 
-	sc->iicbus = device_add_child(dev, "iicbus", -1);
+	sc->iicbus = device_add_child(dev, "iicbus", DEVICE_UNIT_ANY);
 	if (sc->iicbus == NULL) {
 		device_printf(dev, "Could not allocate iicbus instance.\n");
 		error = ENXIO;
@@ -127,7 +127,7 @@ iicoc_attach(device_t dev)
 	}
 
 	/* Probe and attach the iicbus when interrupts are available. */
-	config_intrhook_oneshot((ich_func_t)bus_generic_attach, dev);
+	bus_delayed_attach_children(dev);
 
 	return (0);
 
diff --git a/sys/dev/iicbus/controller/opencores/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c
index a1ed7e9cbc68..f01b4514936e 100644
--- a/sys/dev/iicbus/controller/opencores/iicoc_pci.c
+++ b/sys/dev/iicbus/controller/opencores/iicoc_pci.c
@@ -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);
@@ -80,7 +79,7 @@ iicoc_attach(device_t dev)
 		return (-1);
 	}
 	iicoc_init(dev);
-	sc->iicbus = device_add_child(dev, "iicbus", -1);
+	sc->iicbus = device_add_child(dev, "iicbus", DEVICE_UNIT_ANY);
 	if (sc->iicbus == NULL) {
 		device_printf(dev, "Could not allocate iicbus instance.\n");
 		bus_release_resource(dev, SYS_RES_MEMORY, sc->mem_rid,
@@ -88,7 +87,7 @@ iicoc_attach(device_t dev)
 		mtx_destroy(&sc->sc_mtx);
 		return (-1);
 	}
-	bus_generic_attach(dev);
+	bus_attach_children(dev);
 
 	return (0);
 }