mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-18 02:19:39 +00:00
newbus: globally replace device_add_child(..., -1) with DEVICE_UNIT_ANY
Sponsored by: Netflix
This commit is contained in:
parent
29d13f3d06
commit
5b56413d04
@ -328,7 +328,7 @@ aw_mmc_helper_cd_handler(device_t dev, bool present)
|
||||
if (__predict_false(aw_mmc_debug & AW_MMC_DEBUG_CARD))
|
||||
device_printf(sc->aw_dev, "Card inserted\n");
|
||||
|
||||
sc->child = device_add_child(sc->aw_dev, "mmc", -1);
|
||||
sc->child = device_add_child(sc->aw_dev, "mmc", DEVICE_UNIT_ANY);
|
||||
AW_MMC_UNLOCK(sc);
|
||||
if (sc->child) {
|
||||
device_set_ivars(sc->child, sc);
|
||||
|
@ -442,7 +442,7 @@ rsb_attach(device_t dev)
|
||||
/* Set the PMIC into RSB mode as ATF might have leave it in I2C mode */
|
||||
RSB_WRITE(sc, RSB_PMCR, RSB_PMCR_REG(PMIC_MODE_REG) | RSB_PMCR_DATA(PMIC_MODE_RSB) | RSB_PMCR_START);
|
||||
|
||||
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, "cannot add iicbus child device\n");
|
||||
error = ENXIO;
|
||||
|
@ -280,7 +280,7 @@ madt_gicv2m_handler(ACPI_SUBTABLE_HEADER *entry, void *arg)
|
||||
device_printf(dev, "frame: %x %lx %x %u %u\n", msi->MsiFrameId,
|
||||
msi->BaseAddress, msi->Flags, msi->SpiCount, msi->SpiBase);
|
||||
|
||||
cdev = device_add_child(dev, NULL, -1);
|
||||
cdev = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (cdev == NULL)
|
||||
return;
|
||||
|
||||
|
@ -292,7 +292,7 @@ arm_gic_add_children(device_t dev)
|
||||
ofw_bus_reg_to_rl(dev, child, sc->addr_cells,
|
||||
sc->size_cells, &dinfo->rl);
|
||||
|
||||
cdev = device_add_child(dev, NULL, -1);
|
||||
cdev = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (cdev == NULL) {
|
||||
device_printf(dev, "<%s>: device_add_child failed\n",
|
||||
dinfo->obdinfo.obd_name);
|
||||
|
@ -342,7 +342,7 @@ bcm_bsc_attach(device_t dev)
|
||||
bcm_bsc_reset(sc);
|
||||
BCM_BSC_UNLOCK(sc);
|
||||
|
||||
sc->sc_iicbus = device_add_child(dev, "iicbus", -1);
|
||||
sc->sc_iicbus = device_add_child(dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
if (sc->sc_iicbus == NULL) {
|
||||
bcm_bsc_detach(dev);
|
||||
return (ENXIO);
|
||||
|
@ -298,7 +298,7 @@ bcm_spi_attach(device_t dev)
|
||||
bcm_spi_printr(dev);
|
||||
#endif
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
@ -744,7 +744,7 @@ bcm_pcib_attach(device_t dev)
|
||||
return (error);
|
||||
|
||||
/* Done. */
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -413,7 +413,7 @@ i2c_attach(device_t dev)
|
||||
return (ENXIO);
|
||||
}
|
||||
|
||||
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 add iicbus child");
|
||||
return (ENXIO);
|
||||
|
@ -563,7 +563,7 @@ spi_attach(device_t dev)
|
||||
* devices as its children, and those devices may need to do IO during
|
||||
* their attach. We can't do IO until timers and interrupts are working.
|
||||
*/
|
||||
sc->spibus = device_add_child(dev, "spibus", -1);
|
||||
sc->spibus = device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
return (bus_delayed_attach_children(dev));
|
||||
}
|
||||
|
||||
|
@ -331,7 +331,7 @@ vybrid_ehci_attach(device_t dev)
|
||||
}
|
||||
|
||||
/* Add USB device */
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (!sc->sc_bus.bdev) {
|
||||
device_printf(dev, "Could not add USB device\n");
|
||||
err = bus_teardown_intr(dev, esc->res[5],
|
||||
|
@ -230,7 +230,7 @@ a37x0_iic_attach(device_t dev)
|
||||
a37x0_iic_reset(sc);
|
||||
A37X0_IIC_UNLOCK(sc);
|
||||
|
||||
sc->sc_iicbus = device_add_child(dev, "iicbus", -1);
|
||||
sc->sc_iicbus = device_add_child(dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
if (sc->sc_iicbus == NULL) {
|
||||
a37x0_iic_detach(dev);
|
||||
return (ENXIO);
|
||||
|
@ -214,7 +214,7 @@ a37x0_spi_attach(device_t dev)
|
||||
maxfreq = 0;
|
||||
sc->sc_maxfreq = maxfreq;
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
/* Probe and attach the spibus when interrupts are available. */
|
||||
return (bus_delayed_attach_children(dev));
|
||||
|
@ -553,12 +553,12 @@ mv_pcib_attach(device_t self)
|
||||
if (err)
|
||||
goto error;
|
||||
|
||||
device_add_child(self, "pci", -1);
|
||||
device_add_child(self, "pci", DEVICE_UNIT_ANY);
|
||||
} else {
|
||||
sc->sc_devnr = 1;
|
||||
bus_space_write_4(sc->sc_bst, sc->sc_bsh,
|
||||
PCIE_REG_STATUS, 1 << PCIE_STATUS_DEV_OFFS);
|
||||
device_add_child(self, "pci_ep", -1);
|
||||
device_add_child(self, "pci_ep", DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
mtx_init(&sc->sc_msi_mtx, "msi_mtx", NULL, MTX_DEF);
|
||||
|
@ -185,7 +185,7 @@ mv_pcib_ofw_bus_attach(device_t dev)
|
||||
continue;
|
||||
}
|
||||
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
if (bootverbose) {
|
||||
device_printf(dev,
|
||||
|
@ -168,7 +168,7 @@ mv_spi_attach(device_t dev)
|
||||
|
||||
mtx_init(&sc->sc_mtx, "mv_spi", NULL, MTX_DEF);
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
/* Probe and attach the spibus when interrupts are available. */
|
||||
return (bus_delayed_attach_children(dev));
|
||||
|
@ -259,7 +259,7 @@ tegra_ehci_attach(device_t dev)
|
||||
}
|
||||
|
||||
/* Add USB bus device. */
|
||||
esc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
|
||||
esc->sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (esc->sc_bus.bdev == NULL) {
|
||||
device_printf(dev, "Could not add USB device\n");
|
||||
goto out;
|
||||
|
@ -714,7 +714,7 @@ tegra_i2c_attach(device_t dev)
|
||||
}
|
||||
|
||||
/* Attach the iicbus. */
|
||||
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");
|
||||
rv = ENXIO;
|
||||
|
@ -1565,7 +1565,7 @@ tegra_pcib_attach(device_t dev)
|
||||
if (rv != 0)
|
||||
goto out;
|
||||
#endif
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
|
||||
return (bus_generic_attach(dev));
|
||||
|
||||
|
@ -1048,7 +1048,7 @@ tegra_xhci_attach(device_t dev)
|
||||
strlcpy(xsc->sc_vendor, "Nvidia", sizeof(xsc->sc_vendor));
|
||||
|
||||
/* Add USB bus device. */
|
||||
xsc->sc_bus.bdev = device_add_child(sc->dev, "usbus", -1);
|
||||
xsc->sc_bus.bdev = device_add_child(sc->dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (xsc->sc_bus.bdev == NULL) {
|
||||
device_printf(sc->dev, "Could not add USB device\n");
|
||||
rv = ENXIO;
|
||||
|
@ -327,7 +327,7 @@ musbotg_attach(device_t dev)
|
||||
sc->sc_otg.sc_io_size =
|
||||
rman_get_size(sc->sc_otg.sc_io_res);
|
||||
|
||||
sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1);
|
||||
sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (!(sc->sc_otg.sc_bus.bdev)) {
|
||||
device_printf(dev, "No busdev for musb\n");
|
||||
goto error;
|
||||
|
@ -89,7 +89,7 @@ am335x_scm_identify(driver_t *driver, device_t parent)
|
||||
if (device_find_child(parent, "am335x_scm", -1) != NULL)
|
||||
return;
|
||||
|
||||
child = device_add_child(parent, "am335x_scm", -1);
|
||||
child = device_add_child(parent, "am335x_scm", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(parent, "cannot add ti_scm child\n");
|
||||
}
|
||||
|
@ -263,7 +263,7 @@ ti_spi_attach(device_t dev)
|
||||
ti_spi_printr(dev);
|
||||
#endif
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
@ -337,7 +337,7 @@ omap_ehci_attach(device_t dev)
|
||||
}
|
||||
|
||||
/* Add this device as a child of the USBus device */
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (!sc->sc_bus.bdev) {
|
||||
device_printf(dev, "Error: could not add USB device\n");
|
||||
goto error;
|
||||
|
@ -258,7 +258,7 @@ zy7_ehci_attach(device_t dev)
|
||||
}
|
||||
|
||||
/* Add USB device */
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
|
||||
sc->sc_bus.bdev = device_add_child(dev, "usbus", DEVICE_UNIT_ANY);
|
||||
if (!sc->sc_bus.bdev) {
|
||||
device_printf(dev, "Could not add USB device\n");
|
||||
zy7_ehci_detach(dev);
|
||||
|
@ -598,7 +598,7 @@ zy7_qspi_attach(device_t dev)
|
||||
return (err);
|
||||
}
|
||||
|
||||
sc->child = device_add_child(dev, "spibus", -1);
|
||||
sc->child = device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
zy7_qspi_add_sysctls(dev);
|
||||
|
||||
|
@ -434,7 +434,7 @@ zy7_spi_attach(device_t dev)
|
||||
return (err);
|
||||
}
|
||||
|
||||
sc->child = device_add_child(dev, "spibus", -1);
|
||||
sc->child = device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
zy7_spi_add_sysctls(dev);
|
||||
|
||||
|
@ -406,7 +406,7 @@ gic_v3_add_children(ACPI_SUBTABLE_HEADER *entry, void *arg)
|
||||
return;
|
||||
}
|
||||
|
||||
child = device_add_child(dev, "its", -1);
|
||||
child = device_add_child(dev, "its", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
free(di, M_GIC_V3);
|
||||
return;
|
||||
|
@ -339,7 +339,7 @@ gic_v3_ofw_bus_attach(device_t dev)
|
||||
/* Should not have any interrupts, so don't add any */
|
||||
|
||||
/* Add newbus device for this FDT node */
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (!child) {
|
||||
if (bootverbose) {
|
||||
device_printf(dev,
|
||||
|
@ -342,7 +342,7 @@ brcm_iproc_mdio_attach(device_t dev)
|
||||
ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
|
||||
|
||||
/* Add newbus device for this FDT node */
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
printf("Failed to add child\n");
|
||||
resource_list_free(&di->di_rl);
|
||||
|
@ -215,7 +215,7 @@ brcm_mdionexus_ofw_bus_attach(device_t dev)
|
||||
ofw_bus_intr_to_rl(dev, node, &di->di_rl, NULL);
|
||||
|
||||
/* Add newbus device for this FDT node */
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
resource_list_free(&di->di_rl);
|
||||
ofw_bus_gen_destroy_devinfo(&di->di_dinfo);
|
||||
|
@ -906,7 +906,7 @@ thunder_pem_attach(device_t dev)
|
||||
goto fail_io;
|
||||
}
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
|
||||
return (bus_generic_attach(dev));
|
||||
|
||||
|
@ -1353,7 +1353,7 @@ rk_pcie_attach(device_t dev)
|
||||
APB_WR4(sc, PCIE_RC_CONFIG_LCS, val);
|
||||
|
||||
DELAY(250000);
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
|
||||
out_full:
|
||||
|
@ -3785,7 +3785,7 @@ aac_get_bus_info(struct aac_softc *sc)
|
||||
break;
|
||||
}
|
||||
|
||||
child = device_add_child(sc->aac_dev, "aacp", -1);
|
||||
child = device_add_child(sc->aac_dev, "aacp", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
device_printf(sc->aac_dev,
|
||||
"device_add_child failed for passthrough bus %d\n",
|
||||
|
@ -3608,7 +3608,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");
|
||||
@ -3725,7 +3725,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",
|
||||
|
@ -275,7 +275,7 @@ acpi_video_identify(driver_t *driver, device_t parent)
|
||||
{
|
||||
|
||||
if (device_find_child(parent, "acpi_video", -1) == NULL)
|
||||
device_add_child(parent, "acpi_video", -1);
|
||||
device_add_child(parent, "acpi_video", DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -178,7 +178,7 @@ adb_bus_enumerate(void *xdev)
|
||||
|
||||
for (i = 0; i < 16; i++) {
|
||||
if (sc->devinfo[i].default_address) {
|
||||
sc->children[i] = device_add_child(dev, NULL, -1);
|
||||
sc->children[i] = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
device_set_ivars(sc->children[i], &sc->devinfo[i]);
|
||||
}
|
||||
}
|
||||
|
@ -682,7 +682,7 @@ agp_i810_identify(driver_t *driver, device_t parent)
|
||||
|
||||
if (device_find_child(parent, "agp", -1) == NULL &&
|
||||
agp_i810_match(parent))
|
||||
device_add_child(parent, "agp", -1);
|
||||
device_add_child(parent, "agp", DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -354,7 +354,7 @@ ahci_attach(device_t dev)
|
||||
}
|
||||
/* Attach all channels on this controller */
|
||||
for (unit = 0; unit < ctlr->channels; unit++) {
|
||||
child = device_add_child(dev, "ahcich", -1);
|
||||
child = device_add_child(dev, "ahcich", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
device_printf(dev, "failed to add channel device\n");
|
||||
continue;
|
||||
@ -365,7 +365,7 @@ ahci_attach(device_t dev)
|
||||
}
|
||||
/* Attach any remapped NVME device */
|
||||
for (; unit < ctlr->channels + ctlr->remapped_devices; unit++) {
|
||||
child = device_add_child(dev, "nvme", -1);
|
||||
child = device_add_child(dev, "nvme", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
device_printf(dev, "failed to add remapped NVMe device");
|
||||
continue;
|
||||
@ -377,7 +377,7 @@ ahci_attach(device_t dev)
|
||||
resource_int_value(device_get_name(dev), device_get_unit(dev),
|
||||
"em", &em);
|
||||
if (em) {
|
||||
child = device_add_child(dev, "ahciem", -1);
|
||||
child = device_add_child(dev, "ahciem", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(dev, "failed to add enclosure device\n");
|
||||
else
|
||||
|
@ -218,7 +218,7 @@ alpm_attach(device_t dev)
|
||||
mtx_init(&alpm->lock, device_get_nameunit(dev), "alpm", MTX_DEF);
|
||||
|
||||
/* attach the smbus */
|
||||
alpm->smbus = device_add_child(dev, "smbus", -1);
|
||||
alpm->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (alpm->smbus == NULL) {
|
||||
alpm_detach(dev);
|
||||
return (EINVAL);
|
||||
|
@ -214,7 +214,7 @@ amdpm_attach(device_t dev)
|
||||
mtx_init(&amdpm_sc->lock, device_get_nameunit(dev), "amdpm", MTX_DEF);
|
||||
|
||||
/* Allocate a new smbus device */
|
||||
amdpm_sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
amdpm_sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (!amdpm_sc->smbus) {
|
||||
amdpm_detach(dev);
|
||||
return (EINVAL);
|
||||
|
@ -159,7 +159,7 @@ amdsmb_attach(device_t dev)
|
||||
mtx_init(&amdsmb_sc->lock, device_get_nameunit(dev), "amdsmb", MTX_DEF);
|
||||
|
||||
/* Allocate a new smbus device */
|
||||
amdsmb_sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
amdsmb_sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (!amdsmb_sc->smbus) {
|
||||
amdsmb_detach(dev);
|
||||
return (EINVAL);
|
||||
|
@ -176,7 +176,7 @@ amdsmn_identify(driver_t *driver, device_t parent)
|
||||
if (!amdsmn_match(parent, NULL))
|
||||
return;
|
||||
|
||||
child = device_add_child(parent, "amdsmn", -1);
|
||||
child = device_add_child(parent, "amdsmn", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(parent, "add amdsmn child failed\n");
|
||||
}
|
||||
|
@ -280,7 +280,7 @@ amdtemp_identify(driver_t *driver, device_t parent)
|
||||
return;
|
||||
|
||||
if (amdtemp_match(parent, NULL)) {
|
||||
child = device_add_child(parent, "amdtemp", -1);
|
||||
child = device_add_child(parent, "amdtemp", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(parent, "add amdtemp child failed\n");
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ ata_jmicron_chipinit(device_t dev)
|
||||
pci_write_config(dev, 0x80, 0x01200000, 4);
|
||||
/* Create AHCI subdevice if AHCI part present. */
|
||||
if (ctlr->chip->cfg1) {
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child != NULL) {
|
||||
device_set_ivars(child, (void *)(intptr_t)-1);
|
||||
bus_generic_attach(dev);
|
||||
|
@ -125,7 +125,7 @@ ata_marvell_chipinit(device_t dev)
|
||||
return ENXIO;
|
||||
/* Create AHCI subdevice if AHCI part present. */
|
||||
if (ctlr->chip->cfg1) {
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child != NULL) {
|
||||
device_set_ivars(child, (void *)(intptr_t)-1);
|
||||
bus_generic_attach(dev);
|
||||
|
@ -198,7 +198,7 @@ cardbus_attach_card(device_t cbdev)
|
||||
if (dinfo->pci.cfg.mfdev)
|
||||
cardbusfunchigh = PCI_FUNCMAX;
|
||||
|
||||
child = device_add_child(cbdev, NULL, -1);
|
||||
child = device_add_child(cbdev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
DEVPRINTF((cbdev, "Cannot add child!\n"));
|
||||
pci_freecfg((struct pci_devinfo *)dinfo);
|
||||
|
@ -445,7 +445,7 @@ cfi_attach(device_t dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
device_add_child(dev, "cfid", -1);
|
||||
device_add_child(dev, "cfid", DEVICE_UNIT_ANY);
|
||||
bus_generic_attach(dev);
|
||||
|
||||
return (0);
|
||||
|
@ -1805,7 +1805,7 @@ ccr_identify(driver_t *driver, device_t parent)
|
||||
sc = device_get_softc(parent);
|
||||
if (sc->cryptocaps & FW_CAPS_CONFIG_CRYPTO_LOOKASIDE &&
|
||||
device_find_child(parent, "ccr", -1) == NULL)
|
||||
device_add_child(parent, "ccr", -1);
|
||||
device_add_child(parent, "ccr", DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -2725,7 +2725,7 @@ cxgbe_attach(device_t dev)
|
||||
for_each_vi(pi, i, vi) {
|
||||
if (i == 0)
|
||||
continue;
|
||||
vi->dev = device_add_child(dev, sc->names->vi_ifnet_name, -1);
|
||||
vi->dev = device_add_child(dev, sc->names->vi_ifnet_name, DEVICE_UNIT_ANY);
|
||||
if (vi->dev == NULL) {
|
||||
device_printf(dev, "failed to add VI %d\n", i);
|
||||
continue;
|
||||
|
@ -673,7 +673,7 @@ t4vf_attach(device_t dev)
|
||||
ifmedia_init(&pi->media, IFM_IMASK, cxgbe_media_change,
|
||||
cxgbe_media_status);
|
||||
|
||||
pi->dev = device_add_child(dev, sc->names->vf_ifnet_name, -1);
|
||||
pi->dev = device_add_child(dev, sc->names->vf_ifnet_name, DEVICE_UNIT_ANY);
|
||||
if (pi->dev == NULL) {
|
||||
device_printf(dev,
|
||||
"failed to add device for port %d.\n", i);
|
||||
|
@ -207,7 +207,7 @@ iic_dp_aux_attach(device_t idev)
|
||||
struct iic_dp_aux_data *aux_data;
|
||||
|
||||
aux_data = device_get_softc(idev);
|
||||
aux_data->port = device_add_child(idev, "iicbus", -1);
|
||||
aux_data->port = device_add_child(idev, "iicbus", DEVICE_UNIT_ANY);
|
||||
if (aux_data->port == NULL)
|
||||
return (ENXIO);
|
||||
device_quiet(aux_data->port);
|
||||
|
@ -380,7 +380,7 @@ mii_attach_proxy(device_t dev)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
miiproxy = device_add_child(dev, miiproxy_driver.name, -1);
|
||||
miiproxy = device_add_child(dev, miiproxy_driver.name, DEVICE_UNIT_ANY);
|
||||
error = bus_generic_attach(dev);
|
||||
if (error != 0) {
|
||||
device_printf(dev, "can't attach miiproxy\n");
|
||||
|
@ -643,7 +643,7 @@ exca_init(struct exca_softc *sc, device_t dev,
|
||||
sc->flags = 0;
|
||||
sc->getb = exca_mem_getb;
|
||||
sc->putb = exca_mem_putb;
|
||||
sc->pccarddev = device_add_child(dev, "pccard", -1);
|
||||
sc->pccarddev = device_add_child(dev, "pccard", DEVICE_UNIT_ANY);
|
||||
if (sc->pccarddev == NULL)
|
||||
DEVPRINTF(brdev, "WARNING: cannot add pccard bus.\n");
|
||||
else if (device_probe_and_attach(sc->pccarddev) != 0)
|
||||
|
@ -299,7 +299,7 @@ gpiobus_attach_bus(device_t dev)
|
||||
{
|
||||
device_t busdev;
|
||||
|
||||
busdev = device_add_child(dev, "gpiobus", -1);
|
||||
busdev = device_add_child(dev, "gpiobus", DEVICE_UNIT_ANY);
|
||||
if (busdev == NULL)
|
||||
return (NULL);
|
||||
if (device_add_child(dev, "gpioc", -1) == NULL) {
|
||||
|
@ -320,7 +320,7 @@ gpioiic_attach(device_t dev)
|
||||
#endif
|
||||
|
||||
/* Add the bitbang driver as our only child; it will add iicbus. */
|
||||
device_add_child(sc->dev, "iicbb", -1);
|
||||
device_add_child(sc->dev, "iicbb", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,7 @@ gpio_spi_attach(device_t dev)
|
||||
|
||||
gpio_spi_chip_deactivate(sc, -1);
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -157,7 +157,7 @@ ofw_gpiobus_add_fdt_child(device_t bus, const char *drvname, phandle_t child)
|
||||
/*
|
||||
* Set up the GPIO child and OFW bus layer devinfo and add it to bus.
|
||||
*/
|
||||
childdev = device_add_child(bus, drvname, -1);
|
||||
childdev = device_add_child(bus, drvname, DEVICE_UNIT_ANY);
|
||||
if (childdev == NULL)
|
||||
return (NULL);
|
||||
dinfo = ofw_gpiobus_setup_devinfo(bus, childdev, child);
|
||||
|
@ -1564,7 +1564,7 @@ vmbus_pcib_attach(device_t dev)
|
||||
|
||||
vmbus_pcib_prepopulate_bars(hbus);
|
||||
|
||||
hbus->pci_bus = device_add_child(dev, "pci", -1);
|
||||
hbus->pci_bus = device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
if (!hbus->pci_bus) {
|
||||
device_printf(dev, "failed to create pci bus\n");
|
||||
ret = ENXIO;
|
||||
|
@ -1015,7 +1015,8 @@ vmbus_add_child(struct vmbus_channel *chan)
|
||||
device_t parent = sc->vmbus_dev;
|
||||
|
||||
bus_topo_lock();
|
||||
chan->ch_dev = device_add_child(parent, NULL, -1);
|
||||
|
||||
chan->ch_dev = device_add_child(parent, NULL, DEVICE_UNIT_ANY);
|
||||
if (chan->ch_dev == NULL) {
|
||||
bus_topo_unlock();
|
||||
device_printf(parent, "device_add_child for chan%u failed\n",
|
||||
@ -1379,7 +1380,7 @@ vmbus_identify(driver_t *driver, device_t parent)
|
||||
if (device_get_unit(parent) != 0 || vm_guest != VM_GUEST_HV ||
|
||||
(hyperv_features & CPUID_HV_MSR_SYNIC) == 0)
|
||||
return;
|
||||
device_add_child(parent, "vmbus", -1);
|
||||
device_add_child(parent, "vmbus", DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -132,7 +132,7 @@ vmbus_et_identify(driver_t *driver, device_t parent)
|
||||
hyperv_tc64 == NULL)
|
||||
return;
|
||||
|
||||
device_add_child(parent, VMBUS_ET_NAME, -1);
|
||||
device_add_child(parent, VMBUS_ET_NAME, DEVICE_UNIT_ANY);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -1045,7 +1045,7 @@ ig4iic_attach(ig4iic_softc_t *sc)
|
||||
goto done;
|
||||
ig4iic_get_fifo(sc);
|
||||
|
||||
sc->iicbus = device_add_child(sc->dev, "iicbus", -1);
|
||||
sc->iicbus = device_add_child(sc->dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
if (sc->iicbus == NULL) {
|
||||
device_printf(sc->dev, "iicbus driver not found\n");
|
||||
error = ENXIO;
|
||||
|
@ -301,7 +301,7 @@ ida_setup(struct ida_softc *ida)
|
||||
mtx_unlock(&ida->lock);
|
||||
|
||||
for (i = 0; i < cinfo.num_drvs; i++) {
|
||||
child = device_add_child(ida->dev, /*"idad"*/NULL, -1);
|
||||
child = device_add_child(ida->dev, /*"idad"*/NULL, DEVICE_UNIT_ANY);
|
||||
if (child != NULL)
|
||||
device_set_ivars(child, (void *)(intptr_t)i);
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -80,7 +80,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,
|
||||
|
@ -658,7 +658,7 @@ rk_i2c_attach(device_t 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, "cannot add iicbus child device\n");
|
||||
error = ENXIO;
|
||||
|
@ -184,7 +184,7 @@ vf_i2c_attach_common(device_t dev)
|
||||
|
||||
mtx_unlock(&sc->mutex);
|
||||
|
||||
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 add iicbus child");
|
||||
|
@ -144,7 +144,7 @@ iicbb_attach(device_t dev)
|
||||
{
|
||||
struct iicbb_softc *sc = (struct iicbb_softc *)device_get_softc(dev);
|
||||
|
||||
sc->iicbus = device_add_child(dev, "iicbus", -1);
|
||||
sc->iicbus = device_add_child(dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
if (!sc->iicbus)
|
||||
return (ENXIO);
|
||||
|
||||
|
@ -1190,7 +1190,7 @@ iichid_attach(device_t dev)
|
||||
}
|
||||
#endif /* IICHID_SAMPLING */
|
||||
|
||||
child = device_add_child(dev, "hidbus", -1);
|
||||
child = device_add_child(dev, "hidbus", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
device_printf(sc->dev, "Could not add I2C device\n");
|
||||
iichid_detach(dev);
|
||||
|
@ -152,7 +152,7 @@ iicsmb_attach(device_t dev)
|
||||
|
||||
mtx_init(&sc->lock, "iicsmb", NULL, MTX_DEF);
|
||||
|
||||
sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
|
||||
/* probe and attach the smbus */
|
||||
bus_generic_attach(dev);
|
||||
|
@ -279,7 +279,7 @@ iicmux_attach_children(struct iicmux_softc *sc)
|
||||
idx, sc->numbuses);
|
||||
continue;
|
||||
}
|
||||
sc->childdevs[idx] = device_add_child(sc->dev, "iicbus", -1);
|
||||
sc->childdevs[idx] = device_add_child(sc->dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
sc->childnodes[idx] = child;
|
||||
if (sc->maxbus < (int)idx)
|
||||
sc->maxbus = idx;
|
||||
@ -295,7 +295,7 @@ iicmux_attach_children(struct iicmux_softc *sc)
|
||||
* Add an iicbus child for every downstream bus supported by the mux.
|
||||
*/
|
||||
for (i = 0; i < sc->numbuses; ++i) {
|
||||
sc->childdevs[i] = device_add_child(sc->dev, "iicbus", -1);
|
||||
sc->childdevs[i] = device_add_child(sc->dev, "iicbus", DEVICE_UNIT_ANY);
|
||||
sc->maxbus = i;
|
||||
}
|
||||
|
||||
|
@ -185,7 +185,7 @@ ofw_iicbus_attach(device_t dev)
|
||||
continue;
|
||||
}
|
||||
|
||||
childdev = device_add_child(dev, NULL, -1);
|
||||
childdev = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
resource_list_init(&dinfo->opd_dinfo.rl);
|
||||
ofw_bus_intr_to_rl(childdev, child,
|
||||
&dinfo->opd_dinfo.rl, NULL);
|
||||
|
@ -90,7 +90,7 @@ imcsmb_attach(device_t dev)
|
||||
sc->regs = device_get_ivars(dev);
|
||||
|
||||
/* Create the smbus child */
|
||||
sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (sc->smbus == NULL) {
|
||||
/* Nothing has been allocated, so there's no cleanup. */
|
||||
device_printf(dev, "Child smbus not added\n");
|
||||
|
@ -174,7 +174,7 @@ imcsmb_pci_attach(device_t dev)
|
||||
|
||||
/* Create the imcsmbX children */
|
||||
for (unit = 0; unit < 2; unit++) {
|
||||
child = device_add_child(dev, "imcsmb", -1);
|
||||
child = device_add_child(dev, "imcsmb", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
/* Nothing has been allocated, so there's no cleanup. */
|
||||
device_printf(dev, "Child imcsmb not added\n");
|
||||
|
@ -527,7 +527,7 @@ intelspi_attach(device_t dev)
|
||||
|
||||
intelspi_init(sc);
|
||||
|
||||
device_add_child(dev, "spibus", -1);
|
||||
device_add_child(dev, "spibus", DEVICE_UNIT_ANY);
|
||||
|
||||
return (bus_delayed_attach_children(dev));
|
||||
|
||||
|
@ -326,7 +326,7 @@ intsmb_attach(device_t dev)
|
||||
|
||||
no_intr:
|
||||
sc->isbusy = 0;
|
||||
sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (sc->smbus == NULL) {
|
||||
device_printf(dev, "failed to add smbus child\n");
|
||||
error = ENXIO;
|
||||
|
@ -269,7 +269,7 @@ static int ips_diskdev_init(ips_softc_t *sc)
|
||||
ips_diskdev_statename(sc->drives[i].state));
|
||||
if(sc->drives[i].state == IPS_LD_OKAY ||
|
||||
sc->drives[i].state == IPS_LD_DEGRADED){
|
||||
sc->diskdev[i] = device_add_child(sc->dev, NULL, -1);
|
||||
sc->diskdev[i] = device_add_child(sc->dev, NULL, DEVICE_UNIT_ANY);
|
||||
device_set_ivars(sc->diskdev[i],(void *)(uintptr_t) i);
|
||||
}
|
||||
}
|
||||
|
@ -775,7 +775,7 @@ mfi_attach(struct mfi_softc *sc)
|
||||
&sc->mfi_keep_deleted_volumes, 0,
|
||||
"Don't detach the mfid device for a busy volume that is deleted");
|
||||
|
||||
device_add_child(sc->mfi_dev, "mfip", -1);
|
||||
device_add_child(sc->mfi_dev, "mfip", DEVICE_UNIT_ANY);
|
||||
bus_generic_attach(sc->mfi_dev);
|
||||
|
||||
/* Start the timeout watchdog */
|
||||
|
@ -918,7 +918,7 @@ mge_attach(device_t dev)
|
||||
|
||||
if (sc->switch_attached) {
|
||||
MGE_WRITE(sc, MGE_REG_PHYDEV, MGE_SWITCH_PHYDEV);
|
||||
device_add_child(dev, "mdio", -1);
|
||||
device_add_child(dev, "mdio", DEVICE_UNIT_ANY);
|
||||
bus_generic_attach(dev);
|
||||
}
|
||||
|
||||
|
@ -407,7 +407,7 @@ mii_attach(device_t dev, device_t *miibus, if_t ifp,
|
||||
ivars->ifmedia_upd = ifmedia_upd;
|
||||
ivars->ifmedia_sts = ifmedia_sts;
|
||||
ivars->mii_flags = flags;
|
||||
*miibus = device_add_child(dev, "miibus", -1);
|
||||
*miibus = device_add_child(dev, "miibus", DEVICE_UNIT_ANY);
|
||||
if (*miibus == NULL) {
|
||||
rv = ENXIO;
|
||||
goto fail;
|
||||
@ -496,7 +496,7 @@ mii_attach(device_t dev, device_t *miibus, if_t ifp,
|
||||
if (args == NULL)
|
||||
goto skip;
|
||||
bcopy((char *)&ma, (char *)args, sizeof(ma));
|
||||
phy = device_add_child(*miibus, NULL, -1);
|
||||
phy = device_add_child(*miibus, NULL, DEVICE_UNIT_ANY);
|
||||
if (phy == NULL) {
|
||||
free(args, M_DEVBUF);
|
||||
goto skip;
|
||||
|
@ -560,7 +560,7 @@ mlx_startup(struct mlx_softc *sc)
|
||||
dr->ms_sectors = 63;
|
||||
dr->ms_cylinders = dr->ms_size / (255 * 63);
|
||||
}
|
||||
dr->ms_disk = device_add_child(sc->mlx_dev, /*"mlxd"*/NULL, -1);
|
||||
dr->ms_disk = device_add_child(sc->mlx_dev, /*"mlxd"*/NULL, DEVICE_UNIT_ANY);
|
||||
if (dr->ms_disk == 0)
|
||||
device_printf(sc->mlx_dev, "device_add_child failed\n");
|
||||
device_set_ivars(dr->ms_disk, dr);
|
||||
|
@ -485,7 +485,7 @@ dwmmc_card_task(void *arg, int pending __unused)
|
||||
if (bootverbose)
|
||||
device_printf(sc->dev, "Card inserted\n");
|
||||
|
||||
sc->child = device_add_child(sc->dev, "mmc", -1);
|
||||
sc->child = device_add_child(sc->dev, "mmc", DEVICE_UNIT_ANY);
|
||||
DWMMC_UNLOCK(sc);
|
||||
if (sc->child) {
|
||||
device_set_ivars(sc->child, sc);
|
||||
|
@ -1915,7 +1915,7 @@ mmc_discover_cards(struct mmc_softc *sc)
|
||||
mmc_log_card(sc->dev, ivar, newcard);
|
||||
if (newcard) {
|
||||
/* Add device. */
|
||||
child = device_add_child(sc->dev, NULL, -1);
|
||||
child = device_add_child(sc->dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child != NULL) {
|
||||
device_set_ivars(child, ivar);
|
||||
sc->child_list = realloc(sc->child_list,
|
||||
|
@ -1936,7 +1936,7 @@ mskc_attach(device_t dev)
|
||||
if ((error = mskc_setup_rambuffer(sc)) != 0)
|
||||
goto fail;
|
||||
|
||||
sc->msk_devs[MSK_PORT_A] = device_add_child(dev, "msk", -1);
|
||||
sc->msk_devs[MSK_PORT_A] = device_add_child(dev, "msk", DEVICE_UNIT_ANY);
|
||||
if (sc->msk_devs[MSK_PORT_A] == NULL) {
|
||||
device_printf(dev, "failed to add child for PORT_A\n");
|
||||
error = ENXIO;
|
||||
@ -1953,7 +1953,7 @@ mskc_attach(device_t dev)
|
||||
device_set_ivars(sc->msk_devs[MSK_PORT_A], mmd);
|
||||
|
||||
if (sc->msk_num_port > 1) {
|
||||
sc->msk_devs[MSK_PORT_B] = device_add_child(dev, "msk", -1);
|
||||
sc->msk_devs[MSK_PORT_B] = device_add_child(dev, "msk", DEVICE_UNIT_ANY);
|
||||
if (sc->msk_devs[MSK_PORT_B] == NULL) {
|
||||
device_printf(dev, "failed to add child for PORT_B\n");
|
||||
error = ENXIO;
|
||||
|
@ -162,7 +162,7 @@ mvs_attach(device_t dev)
|
||||
}
|
||||
/* Attach all channels on this controller */
|
||||
for (unit = 0; unit < ctlr->channels; unit++) {
|
||||
child = device_add_child(dev, "mvsch", -1);
|
||||
child = device_add_child(dev, "mvsch", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(dev, "failed to add channel device\n");
|
||||
else
|
||||
|
@ -166,7 +166,7 @@ mvs_attach(device_t dev)
|
||||
}
|
||||
/* Attach all channels on this controller */
|
||||
for (unit = 0; unit < ctlr->channels; unit++) {
|
||||
child = device_add_child(dev, "mvsch", -1);
|
||||
child = device_add_child(dev, "mvsch", DEVICE_UNIT_ANY);
|
||||
if (child == NULL)
|
||||
device_printf(dev, "failed to add channel device\n");
|
||||
else
|
||||
|
@ -801,7 +801,7 @@ mvneta_attach(device_t self)
|
||||
if (mvneta_has_switch(self)) {
|
||||
if (bootverbose)
|
||||
device_printf(self, "This device is attached to a switch\n");
|
||||
child = device_add_child(sc->dev, "mdio", -1);
|
||||
child = device_add_child(sc->dev, "mdio", DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
ether_ifdetach(sc->ifp);
|
||||
mvneta_detach(self);
|
||||
|
@ -196,7 +196,7 @@ nfsmbsub_attach(device_t dev)
|
||||
mtx_init(&nfsmbsub_sc->lock, device_get_nameunit(dev), "nfsmb",
|
||||
MTX_DEF);
|
||||
|
||||
nfsmbsub_sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
nfsmbsub_sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (nfsmbsub_sc->smbus == NULL) {
|
||||
nfsmbsub_detach(dev);
|
||||
return (EINVAL);
|
||||
@ -232,7 +232,7 @@ nfsmb_attach(device_t dev)
|
||||
mtx_init(&nfsmb_sc->lock, device_get_nameunit(dev), "nfsmb", MTX_DEF);
|
||||
|
||||
/* Allocate a new smbus device */
|
||||
nfsmb_sc->smbus = device_add_child(dev, "smbus", -1);
|
||||
nfsmb_sc->smbus = device_add_child(dev, "smbus", DEVICE_UNIT_ANY);
|
||||
if (!nfsmb_sc->smbus) {
|
||||
nfsmb_detach(dev);
|
||||
return (EINVAL);
|
||||
@ -255,7 +255,7 @@ nfsmb_attach(device_t dev)
|
||||
case NFSMB_DEVICEID_NF4_78S_SMB:
|
||||
case NFSMB_DEVICEID_NF4_79_SMB:
|
||||
/* Trying to add secondary device as slave */
|
||||
nfsmb_sc->subdev = device_add_child(dev, "nfsmb", -1);
|
||||
nfsmb_sc->subdev = device_add_child(dev, "nfsmb", DEVICE_UNIT_ANY);
|
||||
if (!nfsmb_sc->subdev) {
|
||||
nfsmb_detach(dev);
|
||||
return (EINVAL);
|
||||
|
@ -107,7 +107,7 @@ ntb_register_device(device_t dev)
|
||||
nc->dbcnt = db;
|
||||
nc->dbmask = (db == 0) ? 0 : (0xffffffffffffffff >> (64 - db));
|
||||
rm_init(&nc->ctx_lock, "ntb ctx");
|
||||
nc->dev = device_add_child(dev, name, -1);
|
||||
nc->dev = device_add_child(dev, name, DEVICE_UNIT_ANY);
|
||||
if (nc->dev == NULL) {
|
||||
ntb_unregister_device(dev);
|
||||
return (ENOMEM);
|
||||
|
@ -462,7 +462,7 @@ ntb_transport_attach(device_t dev)
|
||||
nc->consumer = i;
|
||||
nc->qpoff = qpu;
|
||||
nc->qpcnt = qp;
|
||||
nc->dev = device_add_child(dev, name, -1);
|
||||
nc->dev = device_add_child(dev, name, DEVICE_UNIT_ANY);
|
||||
if (nc->dev == NULL) {
|
||||
device_printf(dev, "Can not add child.\n");
|
||||
break;
|
||||
|
@ -123,7 +123,7 @@ ofw_cpulist_attach(device_t dev)
|
||||
free(dinfo, M_OFWCPU);
|
||||
continue;
|
||||
}
|
||||
cdev = device_add_child(dev, NULL, -1);
|
||||
cdev = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (cdev == NULL) {
|
||||
device_printf(dev, "<%s>: device_add_child failed\n",
|
||||
dinfo->obd_name);
|
||||
|
@ -302,7 +302,7 @@ ofw_pcib_attach(device_t dev)
|
||||
return (error);
|
||||
}
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -321,7 +321,7 @@ ow_add_child(device_t dev, romid_t romid)
|
||||
|
||||
di = malloc(sizeof(*di), M_OW, M_WAITOK);
|
||||
di->romid = romid;
|
||||
child = device_add_child(dev, NULL, -1);
|
||||
child = device_add_child(dev, NULL, DEVICE_UNIT_ANY);
|
||||
if (child == NULL) {
|
||||
free(di, M_OW);
|
||||
return ENOMEM;
|
||||
|
@ -133,7 +133,7 @@ owc_gpiobus_attach(device_t dev)
|
||||
* interrupts work, because we can't do IO for them until we can read
|
||||
* the system timecounter (which initializes after device attachments).
|
||||
*/
|
||||
device_add_child(sc->sc_dev, "ow", -1);
|
||||
device_add_child(sc->sc_dev, "ow", DEVICE_UNIT_ANY);
|
||||
return (bus_delayed_attach_children(dev));
|
||||
}
|
||||
|
||||
|
@ -306,7 +306,7 @@ cbb_pci_attach(device_t brdev)
|
||||
}
|
||||
|
||||
/* attach children */
|
||||
sc->cbdev = device_add_child(brdev, "cardbus", -1);
|
||||
sc->cbdev = device_add_child(brdev, "cardbus", DEVICE_UNIT_ANY);
|
||||
if (sc->cbdev == NULL)
|
||||
DEVPRINTF((brdev, "WARNING: cannot add cardbus bus.\n"));
|
||||
else if (device_probe_and_attach(sc->cbdev) != 0)
|
||||
|
@ -222,7 +222,7 @@ n1sdp_pcie_acpi_attach(device_t dev)
|
||||
if (err)
|
||||
return (err);
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,7 @@ pci_hostb_attach(device_t dev)
|
||||
* an AGP child.
|
||||
*/
|
||||
if (pci_find_cap(dev, PCIY_AGP, NULL) == 0)
|
||||
device_add_child(dev, "agp", -1);
|
||||
device_add_child(dev, "agp", DEVICE_UNIT_ANY);
|
||||
bus_generic_attach(dev);
|
||||
return (0);
|
||||
}
|
||||
|
@ -4426,7 +4426,7 @@ pci_add_child(device_t bus, struct pci_devinfo *dinfo)
|
||||
{
|
||||
device_t dev;
|
||||
|
||||
dinfo->cfg.dev = dev = device_add_child(bus, NULL, -1);
|
||||
dinfo->cfg.dev = dev = device_add_child(bus, NULL, DEVICE_UNIT_ANY);
|
||||
device_set_ivars(dev, dinfo);
|
||||
resource_list_init(&dinfo->resources);
|
||||
pci_cfg_save(dev, dinfo, 0);
|
||||
|
@ -821,7 +821,7 @@ pci_dw_init(device_t dev)
|
||||
if (rv != 0)
|
||||
goto out;
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
|
||||
return (0);
|
||||
out:
|
||||
|
@ -335,7 +335,7 @@ pci_host_generic_acpi_attach(device_t dev)
|
||||
if (error != 0)
|
||||
return (error);
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
@ -170,7 +170,7 @@ pci_host_generic_fdt_attach(device_t dev)
|
||||
if (error != 0)
|
||||
return (error);
|
||||
|
||||
device_add_child(dev, "pci", -1);
|
||||
device_add_child(dev, "pci", DEVICE_UNIT_ANY);
|
||||
return (bus_generic_attach(dev));
|
||||
}
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user