The branch main has been updated by vexeduxr:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b670c9bafc0e31c7609969bf374b2e80bdc00211
commit b670c9bafc0e31c7609969bf374b2e80bdc00211
Author: Ahmad Khalifa <vexed...@freebsd.org>
AuthorDate: 2025-06-11 00:25:08 +0000
Commit: Ahmad Khalifa <vexed...@freebsd.org>
CommitDate: 2025-06-21 02:57:45 +0000
newbus: replace leftover device unit wildcards
Reviewed by: imp, jhb
Approved by: imp (mentor)
Differential Revision: https://reviews.freebsd.org/D50913
---
share/examples/drivers/make_device_driver.sh | 3 ++-
stand/kshim/bsd_kernel.c | 5 +++--
sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 4 ++--
sys/arm/nvidia/tegra124/tegra124_coretemp.c | 4 ++--
sys/arm/nvidia/tegra124/tegra124_cpufreq.c | 4 ++--
sys/arm/ti/am335x/am335x_ehrpwm.c | 3 ++-
sys/arm/ti/am335x/am335x_scm.c | 2 +-
sys/arm/ti/ti_i2c.c | 3 ++-
sys/arm64/arm64/gic_v3_acpi.c | 2 +-
sys/arm64/arm64/gic_v3_fdt.c | 2 +-
sys/arm64/cavium/thunder_pcie_fdt.c | 2 +-
sys/arm64/nvidia/tegra210/tegra210_coretemp.c | 4 ++--
sys/arm64/nvidia/tegra210/tegra210_cpufreq.c | 4 ++--
sys/compat/linuxkpi/common/src/linux_i2c.c | 5 +++--
sys/compat/linuxkpi/common/src/linux_i2cbb.c | 5 +++--
sys/crypto/aesni/aesni.c | 4 ++--
sys/crypto/armv8/armv8_crypto.c | 4 ++--
sys/crypto/blake2/blake2_cryptodev.c | 4 ++--
sys/crypto/openssl/ossl.c | 2 +-
sys/crypto/via/padlock.c | 4 ++--
sys/dev/aac/aac.c | 2 +-
sys/dev/acpi_support/acpi_asus_wmi.c | 4 ++--
sys/dev/acpi_support/acpi_hp.c | 4 ++--
sys/dev/acpi_support/acpi_sbl_wmi.c | 4 ++--
sys/dev/acpica/acpi_pcib_acpi.c | 2 +-
sys/dev/acpica/acpi_perf.c | 2 +-
sys/dev/acpica/acpi_throttle.c | 6 +++---
sys/dev/acpica/acpi_video.c | 2 +-
sys/dev/agp/agp_i810.c | 2 +-
sys/dev/amdsbwd/amdsbwd.c | 5 +++--
sys/dev/amdsmn/amdsmn.c | 2 +-
sys/dev/amdtemp/amdtemp.c | 2 +-
sys/dev/atopcase/atopcase.c | 2 +-
sys/dev/bhnd/bhnd_subr.c | 2 +-
sys/dev/bhnd/cores/chipc/chipc_spi.c | 6 ++++--
sys/dev/bwn/if_bwn_pci.c | 2 +-
sys/dev/chromebook_platform/chromebook_platform.c | 2 +-
sys/dev/coretemp/coretemp.c | 2 +-
sys/dev/cpufreq/cpufreq_dt.c | 2 +-
sys/dev/cpufreq/ichss.c | 8 +++++---
sys/dev/cxgb/cxgb_main.c | 3 ++-
sys/dev/cxgbe/crypto/t4_crypto.c | 2 +-
sys/dev/dpaa2/dpaa2_mc_acpi.c | 2 +-
sys/dev/dpaa2/dpaa2_rc.c | 4 ++--
sys/dev/dpaa2/memac_mdio_acpi.c | 2 +-
sys/dev/efidev/efirtc.c | 4 ++--
sys/dev/etherswitch/e6000sw/e6000sw.c | 2 +-
sys/dev/etherswitch/etherswitch.c | 2 +-
sys/dev/etherswitch/ip17x/ip17x.c | 2 +-
sys/dev/etherswitch/miiproxy.c | 2 +-
sys/dev/etherswitch/rtl8366/rtl8366rb.c | 2 +-
sys/dev/firewire/sbp.c | 2 +-
sys/dev/glxiic/glxiic.c | 7 ++++---
sys/dev/gpio/gpiobus.c | 2 +-
sys/dev/hid/hidraw.c | 2 +-
sys/dev/hyperv/input/hv_hid.c | 2 +-
sys/dev/hyperv/vmbus/vmbus_et.c | 2 +-
sys/dev/ichsmb/ichsmb.c | 3 ++-
sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 2 +-
sys/dev/iicbus/controller/twsi/twsi.c | 3 ++-
sys/dev/iicbus/iic.c | 2 +-
sys/dev/iicbus/iicsmb.c | 2 +-
sys/dev/ipmi/ipmi_isa.c | 2 +-
sys/dev/ipmi/ipmi_smbus.c | 2 +-
sys/dev/isl/isl.c | 2 +-
sys/dev/ismt/ismt.c | 3 ++-
sys/dev/kvm_clock/kvm_clock.c | 2 +-
sys/dev/mdio/mdio.c | 2 +-
sys/dev/mfi/mfi.c | 6 ++++--
sys/dev/mfi/mfi_cam.c | 2 +-
sys/dev/mmcnull/mmcnull.c | 2 +-
sys/dev/nvdimm/nvdimm_e820.c | 2 +-
sys/dev/nvmf/host/nvmf_ctldev.c | 2 +-
sys/dev/p2sb/lewisburg_gpiocm.c | 2 +-
sys/dev/pcf/pcf_isa.c | 2 +-
sys/dev/pci/pci_host_generic_den0115.c | 2 +-
sys/dev/ppbus/if_plip.c | 2 +-
sys/dev/ppbus/lpbb.c | 2 +-
sys/dev/ppbus/lpt.c | 2 +-
sys/dev/ppbus/pcfclock.c | 2 +-
sys/dev/ppbus/ppi.c | 2 +-
sys/dev/ppbus/pps.c | 2 +-
sys/dev/psci/smccc_errata.c | 2 +-
sys/dev/psci/smccc_trng.c | 2 +-
sys/dev/pwm/ofw_pwmbus.c | 6 ++++--
sys/dev/qat/qat/qat_ocf.c | 4 ++--
sys/dev/qcom_qup/qcom_spi.c | 2 +-
sys/dev/sdio/sdiob.c | 2 +-
sys/dev/smbus/smb.c | 2 +-
sys/dev/sound/dummy.c | 4 ++--
sys/dev/sound/pci/hdsp.c | 2 +-
sys/dev/spibus/acpi_spibus.c | 2 +-
sys/dev/superio/superio.c | 2 +-
sys/dev/usb/misc/i2ctinyusb.c | 2 +-
sys/dev/viapm/viapm.c | 2 +-
sys/dev/viawd/viawd.c | 2 +-
sys/dev/virtio/mmio/virtio_mmio.c | 2 +-
sys/isa/isahint.c | 3 ++-
sys/kern/kern_cpu.c | 5 +++--
sys/opencrypto/cryptosoft.c | 2 +-
sys/powerpc/cpufreq/dfs.c | 4 ++--
sys/powerpc/cpufreq/mpc85xx_jog.c | 4 ++--
sys/powerpc/cpufreq/pcr.c | 4 ++--
sys/powerpc/cpufreq/pmcr.c | 4 ++--
sys/powerpc/cpufreq/pmufreq.c | 4 ++--
sys/powerpc/powermac/atibl.c | 2 +-
sys/powerpc/powermac/nvbl.c | 2 +-
sys/powerpc/powernv/opal_i2c.c | 3 ++-
sys/powerpc/ps3/ps3bus.c | 2 +-
sys/powerpc/ps3/ps3pic.c | 2 +-
sys/riscv/riscv/intc.c | 2 +-
sys/riscv/riscv/sbi.c | 6 +++---
sys/x86/cpufreq/est.c | 10 ++++++----
sys/x86/cpufreq/hwpstate_amd.c | 5 +++--
sys/x86/cpufreq/hwpstate_intel.c | 2 +-
sys/x86/cpufreq/p4tcc.c | 2 +-
sys/x86/cpufreq/powernow.c | 5 +++--
sys/x86/cpufreq/smist.c | 8 +++++---
sys/x86/pci/qpi.c | 2 +-
119 files changed, 192 insertions(+), 163 deletions(-)
diff --git a/share/examples/drivers/make_device_driver.sh
b/share/examples/drivers/make_device_driver.sh
index 5b8f8efa6469..d6d3a8d7c6b9 100755
--- a/share/examples/drivers/make_device_driver.sh
+++ b/share/examples/drivers/make_device_driver.sh
@@ -342,7 +342,8 @@ ${1}_isa_identify (driver_t *driver, device_t parent)
if ((ioport == 0) && (irq == 0))
return; /* We've added all our local hints. */
- child = BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "${1}",
-1);
+ child = BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "${1}",
+ DEVICE_UNIT_ANY);
bus_set_resource(child, SYS_RES_IOPORT, 0, ioport, NUMPORTS);
bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1);
bus_set_resource(child, SYS_RES_DRQ, 0, res[i].drq, 1);
diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c
index 91ca46e18d74..455ae570d8ae 100644
--- a/stand/kshim/bsd_kernel.c
+++ b/stand/kshim/bsd_kernel.c
@@ -1326,12 +1326,13 @@ usb_pci_mod_load(void *arg)
{
uint32_t x;
- usb_pci_root = device_add_child(NULL, "pci", -1);
+ usb_pci_root = device_add_child(NULL, "pci", DEVICE_UNIT_ANY);
if (usb_pci_root == NULL)
return;
for (x = 0; x != USB_PCI_USB_MAX; x++) {
- usb_pci_dev[x] = device_add_child(usb_pci_root,
usb_pci_devices[x], -1);
+ usb_pci_dev[x] = device_add_child(usb_pci_root,
+ usb_pci_devices[x], DEVICE_UNIT_ANY);
if (usb_pci_dev[x] == NULL)
continue;
if (device_probe_and_attach(usb_pci_dev[x])) {
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
index 3ef564c6ae13..2bcf6ba8da1e 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
@@ -1204,9 +1204,9 @@ bcm2835_cpufreq_identify(driver_t *driver, device_t
parent)
return;
DPRINTF("driver=%p, parent=%p\n", driver, parent);
- if (device_find_child(parent, "bcm2835_cpufreq", -1) != NULL)
+ if (device_find_child(parent, "bcm2835_cpufreq", DEVICE_UNIT_ANY) !=
NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "bcm2835_cpufreq", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "bcm2835_cpufreq", DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/arm/nvidia/tegra124/tegra124_coretemp.c
b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
index 42ed02de4f86..1a756c62e490 100644
--- a/sys/arm/nvidia/tegra124/tegra124_coretemp.c
+++ b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
@@ -176,9 +176,9 @@ tegra124_coretemp_identify(driver_t *driver, device_t
parent)
root = OF_finddevice("/");
if (!ofw_bus_node_is_compatible(root, "nvidia,tegra124"))
return;
- if (device_find_child(parent, "tegra124_coretemp", -1) != NULL)
+ if (device_find_child(parent, "tegra124_coretemp", DEVICE_UNIT_ANY) !=
NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "tegra124_coretemp", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "tegra124_coretemp", DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
index a537d9397722..2fa6f902cad7 100644
--- a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
+++ b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
@@ -475,9 +475,9 @@ tegra124_cpufreq_identify(driver_t *driver, device_t parent)
if (device_get_unit(parent) != 0)
return;
- if (device_find_child(parent, "tegra124_cpufreq", -1) != NULL)
+ if (device_find_child(parent, "tegra124_cpufreq", DEVICE_UNIT_ANY) !=
NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "tegra124_cpufreq", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "tegra124_cpufreq", DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/arm/ti/am335x/am335x_ehrpwm.c
b/sys/arm/ti/am335x/am335x_ehrpwm.c
index 59ef0931439d..e19933396156 100644
--- a/sys/arm/ti/am335x/am335x_ehrpwm.c
+++ b/sys/arm/ti/am335x/am335x_ehrpwm.c
@@ -512,7 +512,8 @@ am335x_ehrpwm_attach(device_t dev)
reg |= TBCTL_CTRMODE_UP | TBCTL_FREERUN;
EPWM_WRITE2(sc, EPWM_TBCTL, reg);
- if ((sc->sc_busdev = device_add_child(dev, "pwmbus", -1)) == NULL) {
+ if ((sc->sc_busdev = device_add_child(dev, "pwmbus",
+ DEVICE_UNIT_ANY)) == NULL) {
device_printf(dev, "Cannot add child pwmbus\n");
// This driver can still do things even without the bus child.
}
diff --git a/sys/arm/ti/am335x/am335x_scm.c b/sys/arm/ti/am335x/am335x_scm.c
index 8245f35617ad..33268bd0a94b 100644
--- a/sys/arm/ti/am335x/am335x_scm.c
+++ b/sys/arm/ti/am335x/am335x_scm.c
@@ -86,7 +86,7 @@ am335x_scm_identify(driver_t *driver, device_t parent)
return;
/* Make sure we attach only once. */
- if (device_find_child(parent, "am335x_scm", -1) != NULL)
+ if (device_find_child(parent, "am335x_scm", DEVICE_UNIT_ANY) != NULL)
return;
child = device_add_child(parent, "am335x_scm", DEVICE_UNIT_ANY);
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index 53b48e4fe87b..c89809c7a218 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -851,7 +851,8 @@ ti_i2c_attach(device_t dev)
goto out;
/* Attach the iicbus. */
- if ((sc->sc_iicbus = device_add_child(dev, "iicbus", -1)) == NULL) {
+ if ((sc->sc_iicbus = device_add_child(dev, "iicbus",
+ DEVICE_UNIT_ANY)) == NULL) {
device_printf(dev, "could not allocate iicbus instance\n");
err = ENXIO;
goto out;
diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c
index 7c3495fd442b..88fd0394c548 100644
--- a/sys/arm64/arm64/gic_v3_acpi.c
+++ b/sys/arm64/arm64/gic_v3_acpi.c
@@ -450,7 +450,7 @@ gic_v3_acpi_bus_attach(device_t dev)
gic_v3_add_children, dev);
/* Add the vgic child if needed */
if (((uintptr_t)acpi_get_private(dev) & GICV3_PRIV_FLAGS) != 0) {
- child = device_add_child(dev, "vgic", -1);
+ child = device_add_child(dev, "vgic", DEVICE_UNIT_ANY);
if (child == NULL) {
device_printf(dev, "Could not add vgic child\n");
} else {
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
index 9c034b417624..4bea4040c0ba 100644
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -363,7 +363,7 @@ gic_v3_ofw_bus_attach(device_t dev)
* child so we can use this in the vmm module for bhyve.
*/
if (OF_hasprop(parent, "interrupts")) {
- child = device_add_child(dev, "vgic", -1);
+ child = device_add_child(dev, "vgic", DEVICE_UNIT_ANY);
if (child == NULL) {
device_printf(dev, "Could not add vgic child\n");
} else {
diff --git a/sys/arm64/cavium/thunder_pcie_fdt.c
b/sys/arm64/cavium/thunder_pcie_fdt.c
index f173a28b637d..87dc113ad781 100644
--- a/sys/arm64/cavium/thunder_pcie_fdt.c
+++ b/sys/arm64/cavium/thunder_pcie_fdt.c
@@ -152,7 +152,7 @@ thunder_pcie_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);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
index ac037d4ac385..973cbc4759fb 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
@@ -181,9 +181,9 @@ tegra210_coretemp_identify(driver_t *driver, device_t
parent)
root = OF_finddevice("/");
if (!ofw_bus_node_is_compatible(root, "nvidia,tegra210"))
return;
- if (device_find_child(parent, "tegra210_coretemp", -1) != NULL)
+ if (device_find_child(parent, "tegra210_coretemp", DEVICE_UNIT_ANY) !=
NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "tegra210_coretemp", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "tegra210_coretemp", DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
index 9b248a09bd58..56dfc1b32500 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
@@ -393,9 +393,9 @@ tegra210_cpufreq_identify(driver_t *driver, device_t parent)
if (device_get_unit(parent) != 0)
return;
- if (device_find_child(parent, "tegra210_cpufreq", -1) != NULL)
+ if (device_find_child(parent, "tegra210_cpufreq", DEVICE_UNIT_ANY) !=
NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "tegra210_cpufreq", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "tegra210_cpufreq", DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/compat/linuxkpi/common/src/linux_i2c.c
b/sys/compat/linuxkpi/common/src/linux_i2c.c
index d3e69d5df212..f18570202f74 100644
--- a/sys/compat/linuxkpi/common/src/linux_i2c.c
+++ b/sys/compat/linuxkpi/common/src/linux_i2c.c
@@ -85,7 +85,7 @@ lkpi_iic_attach(device_t dev)
struct lkpi_iic_softc *sc;
sc = 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 == NULL) {
device_printf(dev, "Couldn't add iicbus child, aborting\n");
return (ENXIO);
@@ -323,7 +323,8 @@ lkpi_i2c_add_adapter(struct i2c_adapter *adapter)
device_printf(adapter->dev.parent->bsddev,
"Adding i2c adapter %s\n", adapter->name);
sx_xlock(&lkpi_sx_i2c);
- lkpi_iic = device_add_child(adapter->dev.parent->bsddev, "lkpi_iic",
-1);
+ lkpi_iic = device_add_child(adapter->dev.parent->bsddev, "lkpi_iic",
+ DEVICE_UNIT_ANY);
if (lkpi_iic == NULL) {
device_printf(adapter->dev.parent->bsddev, "Couldn't add
lkpi_iic\n");
sx_xunlock(&lkpi_sx_i2c);
diff --git a/sys/compat/linuxkpi/common/src/linux_i2cbb.c
b/sys/compat/linuxkpi/common/src/linux_i2cbb.c
index f266a1404af7..48a018ec2533 100644
--- a/sys/compat/linuxkpi/common/src/linux_i2cbb.c
+++ b/sys/compat/linuxkpi/common/src/linux_i2cbb.c
@@ -90,7 +90,7 @@ lkpi_iicbb_attach(device_t dev)
struct lkpi_iicbb_softc *sc;
sc = device_get_softc(dev);
- sc->iicbb = device_add_child(dev, "iicbb", -1);
+ sc->iicbb = device_add_child(dev, "iicbb", DEVICE_UNIT_ANY);
if (sc->iicbb == NULL) {
device_printf(dev, "Couldn't add iicbb child, aborting\n");
return (ENXIO);
@@ -308,7 +308,8 @@ lkpi_i2c_bit_add_bus(struct i2c_adapter *adapter)
device_printf(adapter->dev.parent->bsddev,
"Adding i2c adapter %s\n", adapter->name);
sx_xlock(&lkpi_sx_i2cbb);
- lkpi_iicbb = device_add_child(adapter->dev.parent->bsddev,
"lkpi_iicbb", -1);
+ lkpi_iicbb = device_add_child(adapter->dev.parent->bsddev, "lkpi_iicbb",
+ DEVICE_UNIT_ANY);
if (lkpi_iicbb == NULL) {
device_printf(adapter->dev.parent->bsddev, "Couldn't add
lkpi_iicbb\n");
sx_xunlock(&lkpi_sx_i2cbb);
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index 6a551577d1b9..be8b234d796c 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -81,8 +81,8 @@ aesni_identify(driver_t *drv, device_t parent)
{
/* NB: order 10 is so we get attached after h/w devices */
- if (device_find_child(parent, "aesni", -1) == NULL &&
- BUS_ADD_CHILD(parent, 10, "aesni", -1) == 0)
+ if (device_find_child(parent, "aesni", DEVICE_UNIT_ANY) == NULL &&
+ BUS_ADD_CHILD(parent, 10, "aesni", DEVICE_UNIT_ANY) == 0)
panic("aesni: could not attach");
}
diff --git a/sys/crypto/armv8/armv8_crypto.c b/sys/crypto/armv8/armv8_crypto.c
index 0a63d052b7a9..5b7ec4fbe125 100644
--- a/sys/crypto/armv8/armv8_crypto.c
+++ b/sys/crypto/armv8/armv8_crypto.c
@@ -73,8 +73,8 @@ armv8_crypto_identify(driver_t *drv, device_t parent)
{
/* NB: order 10 is so we get attached after h/w devices */
- if (device_find_child(parent, "armv8crypto", -1) == NULL &&
- BUS_ADD_CHILD(parent, 10, "armv8crypto", -1) == 0)
+ if (device_find_child(parent, "armv8crypto", DEVICE_UNIT_ANY) == NULL &&
+ BUS_ADD_CHILD(parent, 10, "armv8crypto", DEVICE_UNIT_ANY) == 0)
panic("ARMv8 crypto: could not attach");
}
diff --git a/sys/crypto/blake2/blake2_cryptodev.c
b/sys/crypto/blake2/blake2_cryptodev.c
index 00211544c42b..702a76a8e57a 100644
--- a/sys/crypto/blake2/blake2_cryptodev.c
+++ b/sys/crypto/blake2/blake2_cryptodev.c
@@ -61,8 +61,8 @@ blake2_identify(driver_t *drv, device_t parent)
{
/* NB: order 10 is so we get attached after h/w devices */
- if (device_find_child(parent, "blaketwo", -1) == NULL &&
- BUS_ADD_CHILD(parent, 10, "blaketwo", -1) == 0)
+ if (device_find_child(parent, "blaketwo", DEVICE_UNIT_ANY) == NULL &&
+ BUS_ADD_CHILD(parent, 10, "blaketwo", DEVICE_UNIT_ANY) == 0)
panic("blaketwo: could not attach");
}
diff --git a/sys/crypto/openssl/ossl.c b/sys/crypto/openssl/ossl.c
index c2ca28133a78..203091c1e50b 100644
--- a/sys/crypto/openssl/ossl.c
+++ b/sys/crypto/openssl/ossl.c
@@ -56,7 +56,7 @@ static void
ossl_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "ossl", -1) == NULL)
+ if (device_find_child(parent, "ossl", DEVICE_UNIT_ANY) == NULL)
BUS_ADD_CHILD(parent, 10, "ossl", DEVICE_UNIT_ANY);
}
diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index 359618409f09..1123aa2f0c74 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -71,8 +71,8 @@ static void
padlock_identify(driver_t *drv, device_t parent)
{
/* NB: order 10 is so we get attached after h/w devices */
- if (device_find_child(parent, "padlock", -1) == NULL &&
- BUS_ADD_CHILD(parent, 10, "padlock", -1) == 0)
+ if (device_find_child(parent, "padlock", DEVICE_UNIT_ANY) == NULL &&
+ BUS_ADD_CHILD(parent, 10, "padlock", DEVICE_UNIT_ANY) == 0)
panic("padlock: could not attach");
}
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 912b3dc903e3..2519c66e81d4 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -473,7 +473,7 @@ aac_add_container(struct aac_softc *sc, struct
aac_mntinforesp *mir, int f)
mir->MntTable[0].FileSystemName,
mir->MntTable[0].Capacity, mir->MntTable[0].VolType);
- if ((child = device_add_child(sc->aac_dev, "aacd", -1)) == NULL)
+ if ((child = device_add_child(sc->aac_dev, "aacd",
DEVICE_UNIT_ANY)) == NULL)
device_printf(sc->aac_dev, "device_add_child failed\n");
else
device_set_ivars(child, co);
diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c
b/sys/dev/acpi_support/acpi_asus_wmi.c
index 0e9c35d42793..0198ccada3ed 100644
--- a/sys/dev/acpi_support/acpi_asus_wmi.c
+++ b/sys/dev/acpi_support/acpi_asus_wmi.c
@@ -454,7 +454,7 @@ acpi_asus_wmi_identify(driver_t *driver, device_t parent)
return;
/* Add only a single device instance. */
- if (device_find_child(parent, "acpi_asus_wmi", -1) != NULL)
+ if (device_find_child(parent, "acpi_asus_wmi", DEVICE_UNIT_ANY) != NULL)
return;
/* Check management GUID to see whether system is compatible. */
@@ -462,7 +462,7 @@ acpi_asus_wmi_identify(driver_t *driver, device_t parent)
ACPI_ASUS_WMI_MGMT_GUID))
return;
- if (BUS_ADD_CHILD(parent, 0, "acpi_asus_wmi", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "acpi_asus_wmi", DEVICE_UNIT_ANY) == NULL)
device_printf(parent, "add acpi_asus_wmi child failed\n");
}
diff --git a/sys/dev/acpi_support/acpi_hp.c b/sys/dev/acpi_support/acpi_hp.c
index 088e46af2ce3..5523b8768d41 100644
--- a/sys/dev/acpi_support/acpi_hp.c
+++ b/sys/dev/acpi_support/acpi_hp.c
@@ -465,7 +465,7 @@ acpi_hp_identify(driver_t *driver, device_t parent)
return;
/* Add only a single device instance. */
- if (device_find_child(parent, "acpi_hp", -1) != NULL)
+ if (device_find_child(parent, "acpi_hp", DEVICE_UNIT_ANY) != NULL)
return;
/* Check BIOS GUID to see whether system is compatible. */
@@ -473,7 +473,7 @@ acpi_hp_identify(driver_t *driver, device_t parent)
ACPI_HP_WMI_BIOS_GUID))
return;
- if (BUS_ADD_CHILD(parent, 0, "acpi_hp", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "acpi_hp", DEVICE_UNIT_ANY) == NULL)
device_printf(parent, "add acpi_hp child failed\n");
}
diff --git a/sys/dev/acpi_support/acpi_sbl_wmi.c
b/sys/dev/acpi_support/acpi_sbl_wmi.c
index 7f8bbeb88317..8abee8c94e26 100644
--- a/sys/dev/acpi_support/acpi_sbl_wmi.c
+++ b/sys/dev/acpi_support/acpi_sbl_wmi.c
@@ -59,7 +59,7 @@ acpi_sbl_wmi_identify(driver_t *driver, device_t parent)
return;
/* Add only a single device instance. */
- if (device_find_child(parent, "acpi_sbl_wmi", -1) != NULL)
+ if (device_find_child(parent, "acpi_sbl_wmi", DEVICE_UNIT_ANY) != NULL)
return;
/* Check management GUID to see whether system is compatible. */
@@ -67,7 +67,7 @@ acpi_sbl_wmi_identify(driver_t *driver, device_t parent)
ACPI_SBL_FW_UPDATE_WMI_GUID))
return;
- if (BUS_ADD_CHILD(parent, 0, "acpi_sbl_wmi", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "acpi_sbl_wmi", DEVICE_UNIT_ANY) == NULL)
device_printf(parent, "add acpi_sbl_wmi child failed\n");
}
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index e8ab481d776f..3913ec612f79 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -473,7 +473,7 @@ acpi_pcib_acpi_attach(device_t dev)
error = 0;
bus_identify_children(dev);
- if (device_add_child(dev, "pci", -1) == NULL) {
+ if (device_add_child(dev, "pci", DEVICE_UNIT_ANY) == NULL) {
bus_dma_tag_destroy(sc->ap_dma_tag);
sc->ap_dma_tag = NULL;
error = ENXIO;
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index 0013d2a94552..ee7a4355f32a 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -142,7 +142,7 @@ acpi_perf_identify(driver_t *driver, device_t parent)
device_t dev;
/* Make sure we're not being doubly invoked. */
- if (device_find_child(parent, "acpi_perf", -1) != NULL)
+ if (device_find_child(parent, "acpi_perf", DEVICE_UNIT_ANY) != NULL)
return;
/* Get the handle for the Processor object and check for perf states. */
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index 5cdca63c27c6..8b2919c71073 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -131,7 +131,7 @@ acpi_throttle_identify(driver_t *driver, device_t parent)
ACPI_OBJECT *obj;
/* Make sure we're not being doubly invoked. */
- if (device_find_child(parent, "acpi_throttle", -1))
+ if (device_find_child(parent, "acpi_throttle", DEVICE_UNIT_ANY))
return;
/* Check for a valid duty width and parent CPU type. */
@@ -173,8 +173,8 @@ acpi_throttle_probe(device_t dev)
* Since p4tcc uses the same mechanism (but internal to the CPU),
* we disable acpi_throttle when p4tcc is also present.
*/
- if (device_find_child(device_get_parent(dev), "p4tcc", -1) &&
- !resource_disabled("p4tcc", 0))
+ if (device_find_child(device_get_parent(dev), "p4tcc", DEVICE_UNIT_ANY)
+ && !resource_disabled("p4tcc", 0))
return (ENXIO);
device_set_desc(dev, "ACPI CPU Throttling");
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index 472a38d3eb56..7a22c9dc0994 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -274,7 +274,7 @@ static void
acpi_video_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "acpi_video", -1) == NULL)
+ if (device_find_child(parent, "acpi_video", DEVICE_UNIT_ANY) == NULL)
device_add_child(parent, "acpi_video", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index b63c0aaf634a..9d955745f673 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -680,7 +680,7 @@ static void
agp_i810_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "agp", -1) == NULL &&
+ if (device_find_child(parent, "agp", DEVICE_UNIT_ANY) == NULL &&
agp_i810_match(parent))
device_add_child(parent, "agp", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c
index 122fa2d58277..d817a7b1364e 100644
--- a/sys/dev/amdsbwd/amdsbwd.c
+++ b/sys/dev/amdsbwd/amdsbwd.c
@@ -255,7 +255,7 @@ amdsbwd_identify(driver_t *driver, device_t parent)
if (resource_disabled("amdsbwd", 0))
return;
- if (device_find_child(parent, "amdsbwd", -1) != NULL)
+ if (device_find_child(parent, "amdsbwd", DEVICE_UNIT_ANY) != NULL)
return;
/*
@@ -271,7 +271,8 @@ amdsbwd_identify(driver_t *driver, device_t parent)
pci_get_devid(smb_dev) != HYGONCZ_SMBUS_DEVID)
return;
- child = BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "amdsbwd",
DEVICE_UNIT_ANY);
+ child = BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "amdsbwd",
+ DEVICE_UNIT_ANY);
if (child == NULL)
device_printf(parent, "add amdsbwd child failed\n");
}
diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c
index 803491e9b0f5..d19103738ec6 100644
--- a/sys/dev/amdsmn/amdsmn.c
+++ b/sys/dev/amdsmn/amdsmn.c
@@ -207,7 +207,7 @@ amdsmn_identify(driver_t *driver, device_t parent)
device_t child;
/* Make sure we're not being doubly invoked. */
- if (device_find_child(parent, "amdsmn", -1) != NULL)
+ if (device_find_child(parent, "amdsmn", DEVICE_UNIT_ANY) != NULL)
return;
if (!amdsmn_match(parent, NULL))
return;
diff --git a/sys/dev/amdtemp/amdtemp.c b/sys/dev/amdtemp/amdtemp.c
index 3ce826a2c0ec..79ccdc8c79fb 100644
--- a/sys/dev/amdtemp/amdtemp.c
+++ b/sys/dev/amdtemp/amdtemp.c
@@ -287,7 +287,7 @@ amdtemp_identify(driver_t *driver, device_t parent)
device_t child;
/* Make sure we're not being doubly invoked. */
- if (device_find_child(parent, "amdtemp", -1) != NULL)
+ if (device_find_child(parent, "amdtemp", DEVICE_UNIT_ANY) != NULL)
return;
if (amdtemp_match(parent, NULL)) {
diff --git a/sys/dev/atopcase/atopcase.c b/sys/dev/atopcase/atopcase.c
index 9e64b389c9e3..8dc81046e47e 100644
--- a/sys/dev/atopcase/atopcase.c
+++ b/sys/dev/atopcase/atopcase.c
@@ -476,7 +476,7 @@ atopcase_add_child(struct atopcase_softc *sc, struct
atopcase_child *ac,
goto exit;
}
- hidbus = device_add_child(sc->sc_dev, "hidbus", -1);
+ hidbus = device_add_child(sc->sc_dev, "hidbus", DEVICE_UNIT_ANY);
if (hidbus == NULL) {
device_printf(sc->sc_dev, "can't add child\n");
err = ENOMEM;
diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c
index 1c456ed1cddf..4818fffd5659 100644
--- a/sys/dev/bhnd/bhnd_subr.c
+++ b/sys/dev/bhnd/bhnd_subr.c
@@ -2170,7 +2170,7 @@ bhnd_bus_generic_get_nvram_var(device_t dev, device_t
child, const char *name,
bus_topo_assert();
/* Look for a directly-attached NVRAM child */
- if ((nvram = device_find_child(dev, "bhnd_nvram", -1)) != NULL)
+ if ((nvram = device_find_child(dev, "bhnd_nvram", DEVICE_UNIT_ANY)) !=
NULL)
return BHND_NVRAM_GETVAR(nvram, name, buf, size, type);
/* Try to delegate to parent */
diff --git a/sys/dev/bhnd/cores/chipc/chipc_spi.c
b/sys/dev/bhnd/cores/chipc/chipc_spi.c
index e89d128fa441..290933e5ef25 100644
--- a/sys/dev/bhnd/cores/chipc/chipc_spi.c
+++ b/sys/dev/bhnd/cores/chipc/chipc_spi.c
@@ -107,7 +107,8 @@ chipc_spi_attach(device_t dev)
* XXX: This should be replaced with a DEVICE_IDENTIFY implementation
* in chipc-specific subclasses of the mx25l and at45d drivers.
*/
- if ((spibus = device_add_child(dev, "spibus", -1)) == NULL) {
+ if ((spibus = device_add_child(dev, "spibus",
+ DEVICE_UNIT_ANY)) == NULL) {
device_printf(dev, "failed to add spibus\n");
error = ENXIO;
goto failed;
@@ -121,7 +122,8 @@ chipc_spi_attach(device_t dev)
ccaps = BHND_CHIPC_GET_CAPS(device_get_parent(dev));
flash_name = chipc_sflash_device_name(ccaps->flash_type);
if (flash_name != NULL) {
- flash_dev = BUS_ADD_CHILD(spibus, 0, flash_name,
DEVICE_UNIT_ANY);
+ flash_dev = BUS_ADD_CHILD(spibus, 0, flash_name,
+ DEVICE_UNIT_ANY);
if (flash_dev == NULL) {
device_printf(dev, "failed to add %s\n", flash_name);
error = ENXIO;
diff --git a/sys/dev/bwn/if_bwn_pci.c b/sys/dev/bwn/if_bwn_pci.c
index a81284158443..a64c53acf40f 100644
--- a/sys/dev/bwn/if_bwn_pci.c
+++ b/sys/dev/bwn/if_bwn_pci.c
@@ -182,7 +182,7 @@ bwn_pci_attach(device_t dev)
sc->quirks = ident->quirks;
/* Attach bridge device */
- if ((error = bhndb_attach_bridge(dev, &sc->bhndb_dev, -1)))
+ if ((error = bhndb_attach_bridge(dev, &sc->bhndb_dev, DEVICE_UNIT_ANY)))
return (ENXIO);
/* Success */
diff --git a/sys/dev/chromebook_platform/chromebook_platform.c
b/sys/dev/chromebook_platform/chromebook_platform.c
index 935685d86955..f873338a3ba6 100644
--- a/sys/dev/chromebook_platform/chromebook_platform.c
+++ b/sys/dev/chromebook_platform/chromebook_platform.c
@@ -70,7 +70,7 @@ chromebook_i2c_identify(driver_t *driver, device_t bus)
return;
for (i = 0; i < nitems(slaves); i++) {
- if (device_find_child(bus, slaves[i].name, -1) != NULL)
+ if (device_find_child(bus, slaves[i].name, DEVICE_UNIT_ANY) !=
NULL)
continue;
if (slaves[i].pci_id != pci_get_devid(controller))
continue;
diff --git a/sys/dev/coretemp/coretemp.c b/sys/dev/coretemp/coretemp.c
index 4a7e4e7834d8..df1dcff83639 100644
--- a/sys/dev/coretemp/coretemp.c
+++ b/sys/dev/coretemp/coretemp.c
@@ -112,7 +112,7 @@ coretemp_identify(driver_t *driver, device_t parent)
u_int regs[4];
/* Make sure we're not being doubly invoked. */
- if (device_find_child(parent, "coretemp", -1) != NULL)
+ if (device_find_child(parent, "coretemp", DEVICE_UNIT_ANY) != NULL)
return;
/* Check that CPUID 0x06 is supported and the vendor is Intel.*/
diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c
index e35a8ec73ef4..b212b08e9a83 100644
--- a/sys/dev/cpufreq/cpufreq_dt.c
+++ b/sys/dev/cpufreq/cpufreq_dt.c
@@ -315,7 +315,7 @@ cpufreq_dt_identify(driver_t *driver, device_t parent)
!OF_hasprop(node, "operating-points-v2"))
return;
- if (device_find_child(parent, "cpufreq_dt", -1) != NULL)
+ if (device_find_child(parent, "cpufreq_dt", DEVICE_UNIT_ANY) != NULL)
return;
if (BUS_ADD_CHILD(parent, 0, "cpufreq_dt", device_get_unit(parent))
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index f1ec62ed6d8a..6c30bbb9700d 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -147,7 +147,7 @@ ichss_identify(driver_t *driver, device_t parent)
return;
/* Avoid duplicates. */
- if (device_find_child(parent, "ichss", -1))
+ if (device_find_child(parent, "ichss", DEVICE_UNIT_ANY))
return;
/*
@@ -218,13 +218,15 @@ ichss_probe(device_t dev)
* info, let it manage things. Also, if Enhanced SpeedStep is
* available, don't attach.
*/
- perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
+ perf_dev = device_find_child(device_get_parent(dev), "acpi_perf",
+ DEVICE_UNIT_ANY);
if (perf_dev && device_is_attached(perf_dev)) {
error = CPUFREQ_DRV_TYPE(perf_dev, &type);
if (error == 0 && (type & CPUFREQ_FLAG_INFO_ONLY) == 0)
return (ENXIO);
}
- est_dev = device_find_child(device_get_parent(dev), "est", -1);
+ est_dev = device_find_child(device_get_parent(dev), "est",
+ DEVICE_UNIT_ANY);
if (est_dev && device_is_attached(est_dev))
return (ENXIO);
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 882d1c6cc4a4..616a2ecc1a37 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -622,7 +622,8 @@ cxgb_controller_attach(device_t dev)
for (i = 0; i < (sc)->params.nports; i++) {
struct port_info *pi;
- if ((child = device_add_child(dev, "cxgb", -1)) == NULL) {
+ if ((child = device_add_child(dev, "cxgb",
+ DEVICE_UNIT_ANY)) == NULL) {
device_printf(dev, "failed to add child port\n");
error = EINVAL;
goto out;
diff --git a/sys/dev/cxgbe/crypto/t4_crypto.c b/sys/dev/cxgbe/crypto/t4_crypto.c
index 568a948a49f7..2c83b10b13d6 100644
--- a/sys/dev/cxgbe/crypto/t4_crypto.c
+++ b/sys/dev/cxgbe/crypto/t4_crypto.c
@@ -1804,7 +1804,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_find_child(parent, "ccr", DEVICE_UNIT_ANY) == NULL)
device_add_child(parent, "ccr", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/dpaa2/dpaa2_mc_acpi.c b/sys/dev/dpaa2/dpaa2_mc_acpi.c
index 1042ea56d8cf..55c1c0d5b12e 100644
--- a/sys/dev/dpaa2/dpaa2_mc_acpi.c
+++ b/sys/dev/dpaa2/dpaa2_mc_acpi.c
@@ -229,7 +229,7 @@ dpaa2_mc_acpi_probe_child(ACPI_HANDLE h, device_t *dev, int
level, void *arg)
if ((ad = malloc(sizeof(*ad), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL)
return (AE_OK);
- child = device_add_child(ctx->dev, "dpaa2_mac_dev", -1);
+ child = device_add_child(ctx->dev, "dpaa2_mac_dev", DEVICE_UNIT_ANY);
if (child == NULL) {
free(ad, M_DEVBUF);
return (AE_OK);
diff --git a/sys/dev/dpaa2/dpaa2_rc.c b/sys/dev/dpaa2/dpaa2_rc.c
index d8e15e388bf5..3cb2fdfeaa2e 100644
--- a/sys/dev/dpaa2/dpaa2_rc.c
+++ b/sys/dev/dpaa2/dpaa2_rc.c
@@ -2905,7 +2905,7 @@ dpaa2_rc_add_child(struct dpaa2_rc_softc *sc, struct
dpaa2_cmd *cmd,
}
/* Add a device for the DPAA2 object. */
- dev = device_add_child(rcdev, devclass, -1);
+ dev = device_add_child(rcdev, devclass, DEVICE_UNIT_ANY);
if (dev == NULL) {
device_printf(rcdev, "%s: failed to add a device for DPAA2 "
"object: type=%s, id=%u\n", __func__, dpaa2_ttos(obj->type),
@@ -3031,7 +3031,7 @@ dpaa2_rc_add_managed_child(struct dpaa2_rc_softc *sc,
struct dpaa2_cmd *cmd,
}
/* Add a device for the DPAA2 object. */
- dev = device_add_child(rcdev, devclass, -1);
+ dev = device_add_child(rcdev, devclass, DEVICE_UNIT_ANY);
if (dev == NULL) {
device_printf(rcdev, "%s: failed to add a device for DPAA2 "
"object: type=%s, id=%u\n", __func__, dpaa2_ttos(obj->type),
diff --git a/sys/dev/dpaa2/memac_mdio_acpi.c b/sys/dev/dpaa2/memac_mdio_acpi.c
index 3a816901815b..dc08715343e0 100644
--- a/sys/dev/dpaa2/memac_mdio_acpi.c
+++ b/sys/dev/dpaa2/memac_mdio_acpi.c
@@ -227,7 +227,7 @@ memac_mdio_acpi_probe_child(ACPI_HANDLE h, device_t *dev,
int level, void *arg)
if ((ad = malloc(sizeof(*ad), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL)
return (AE_OK);
- child = device_add_child(ctx->dev, "memacphy_acpi", -1);
+ child = device_add_child(ctx->dev, "memacphy_acpi", DEVICE_UNIT_ANY);
if (child == NULL) {
free(ad, M_DEVBUF);
return (AE_OK);
diff --git a/sys/dev/efidev/efirtc.c b/sys/dev/efidev/efirtc.c
index a7baff673c1c..69d2c0b1af9f 100644
--- a/sys/dev/efidev/efirtc.c
+++ b/sys/dev/efidev/efirtc.c
@@ -52,9 +52,9 @@ efirtc_identify(driver_t *driver, device_t parent)
/* Don't add the driver unless we have working runtime services. */
if (efi_rt_ok() != 0)
return;
- if (device_find_child(parent, "efirtc", -1) != NULL)
+ if (device_find_child(parent, "efirtc", DEVICE_UNIT_ANY) != NULL)
return;
- if (BUS_ADD_CHILD(parent, 0, "efirtc", -1) == NULL)
+ if (BUS_ADD_CHILD(parent, 0, "efirtc", DEVICE_UNIT_ANY) == NULL)
device_printf(parent, "add child failed\n");
}
diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c
b/sys/dev/etherswitch/e6000sw/e6000sw.c
index 4ef510b85c70..7e9193f4ba47 100644
--- a/sys/dev/etherswitch/e6000sw/e6000sw.c
+++ b/sys/dev/etherswitch/e6000sw/e6000sw.c
@@ -205,7 +205,7 @@ static void
e6000sw_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "e6000sw", -1) == NULL)
+ if (device_find_child(parent, "e6000sw", DEVICE_UNIT_ANY) == NULL)
BUS_ADD_CHILD(parent, 0, "e6000sw", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/etherswitch/etherswitch.c
b/sys/dev/etherswitch/etherswitch.c
index c66918f77174..ba46d8b2299d 100644
--- a/sys/dev/etherswitch/etherswitch.c
+++ b/sys/dev/etherswitch/etherswitch.c
@@ -82,7 +82,7 @@ static struct cdevsw etherswitch_cdevsw = {
static void
etherswitch_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "etherswitch", -1) == NULL)
+ if (device_find_child(parent, "etherswitch", DEVICE_UNIT_ANY) == NULL)
BUS_ADD_CHILD(parent, 0, "etherswitch", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/etherswitch/ip17x/ip17x.c
b/sys/dev/etherswitch/ip17x/ip17x.c
index c90d46c49857..42d3bf990c0e 100644
--- a/sys/dev/etherswitch/ip17x/ip17x.c
+++ b/sys/dev/etherswitch/ip17x/ip17x.c
@@ -83,7 +83,7 @@ static void ip17x_ifmedia_sts(if_t, struct ifmediareq *);
static void
ip17x_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, "ip17x", -1) == NULL)
+ if (device_find_child(parent, "ip17x", DEVICE_UNIT_ANY) == NULL)
BUS_ADD_CHILD(parent, 0, "ip17x", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/etherswitch/miiproxy.c b/sys/dev/etherswitch/miiproxy.c
index 2af6533d41c8..79342a9e8e03 100644
--- a/sys/dev/etherswitch/miiproxy.c
+++ b/sys/dev/etherswitch/miiproxy.c
@@ -331,7 +331,7 @@ mdioproxy_rendezvous_callback(enum rendezvous_op op, struct
rendezvous_entry *re
static void
mdioproxy_identify(driver_t *driver, device_t parent)
{
- if (device_find_child(parent, driver->name, -1) == NULL) {
+ if (device_find_child(parent, driver->name, DEVICE_UNIT_ANY) == NULL) {
BUS_ADD_CHILD(parent, 0, driver->name, DEVICE_UNIT_ANY);
}
}
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index 079244b2f745..9000061ae138 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -133,7 +133,7 @@ rtl8366rb_identify(driver_t *driver, device_t parent)
device_t child;
struct iicbus_ivar *devi;
- if (device_find_child(parent, "rtl8366rb", -1) == NULL) {
+ if (device_find_child(parent, "rtl8366rb", DEVICE_UNIT_ANY) == NULL) {
child = BUS_ADD_CHILD(parent, 0, "rtl8366rb", DEVICE_UNIT_ANY);
devi = IICBUS_IVAR(child);
devi->addr = RTL8366_IIC_ADDR;
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 2a91f6987e69..be1e60e45e75 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -303,7 +303,7 @@ SBP_DEBUG(0)
printf("sbp_identify\n");
END_DEBUG
- if (device_find_child(parent, "sbp", -1) == NULL)
+ if (device_find_child(parent, "sbp", DEVICE_UNIT_ANY) == NULL)
BUS_ADD_CHILD(parent, 0, "sbp", DEVICE_UNIT_ANY);
}
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index ddaa77b6b73c..ef0a0e111339 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -284,11 +284,11 @@ glxiic_identify(driver_t *driver, device_t parent)
{
/* Prevent child from being added more than once. */
- if (device_find_child(parent, driver->name, -1) != NULL)
+ if (device_find_child(parent, driver->name, DEVICE_UNIT_ANY) != NULL)
return;
if (pci_get_devid(parent) == GLXIIC_CS5536_DEV_ID) {
- if (device_add_child(parent, driver->name, -1) == NULL)
+ if (device_add_child(parent, driver->name, DEVICE_UNIT_ANY) ==
NULL)
device_printf(parent, "Could not add glxiic child\n");
}
}
@@ -390,7 +390,8 @@ glxiic_attach(device_t dev)
goto out;
}
- if ((sc->iicbus = device_add_child(dev, "iicbus", -1)) == NULL) {
+ if ((sc->iicbus = device_add_child(dev, "iicbus",
+ DEVICE_UNIT_ANY)) == NULL) {
device_printf(dev, "Could not allocate iicbus instance\n");
error = ENXIO;
goto out;
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index e053adacf457..2e2618805e7b 100644
*** 1015 LINES SKIPPED ***
