8 files changed, 10 insertions, 8 deletions
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index ea1897e896d7..d23df8a2387e 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -574,7 +574,7 @@ apecs_probe(device_t dev)
 	isa_init_intr();
 	apecs_init_sgmap();
 
-	device_add_child(dev, "pcib", 0, 0);
+	device_add_child(dev, "pcib", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index 7a0573b2f369..bb1b8bd8ad9c 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -42,7 +42,7 @@ apecs_pcib_probe(device_t dev)
 {
 	device_set_desc(dev, "2107x PCI host bus adapter");
 
-	device_add_child(dev, "pci", 0, 0);
+	device_add_child(dev, "pci", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index f89de155719a..55a4750f7420 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -897,7 +897,7 @@ cia_probe(device_t dev)
 	isa_init_intr();
 	cia_init_sgmap();
 
-	device_add_child(dev, "pcib", 0, 0);
+	device_add_child(dev, "pcib", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index 73da41a852fc..32bf6452a0ac 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -42,7 +42,7 @@ cia_pcib_probe(device_t dev)
 {
 	device_set_desc(dev, "2117x PCI host bus adapter");
 
-	device_add_child(dev, "pci", 0, 0);
+	device_add_child(dev, "pci", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index 59513327e8a3..c1b80822b386 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -460,7 +460,7 @@ lca_probe(device_t dev)
 	isa_init_intr();
 	lca_init_sgmap();
 
-	device_add_child(dev, "pcib", 0, 0);
+	device_add_child(dev, "pcib", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index 10a5a2aad016..1765c3b74c84 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -42,7 +42,7 @@ lca_pcib_probe(device_t dev)
 {
 	device_set_desc(dev, "21066 PCI host bus adapter");
 
-	device_add_child(dev, "pci", 0, 0);
+	device_add_child(dev, "pci", 0);
 
 	return 0;
 }
diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c
index 43b8b4d0f0ca..c9cb3b503c1c 100644
--- a/sys/alpha/pci/tsunami.c
+++ b/sys/alpha/pci/tsunami.c
@@ -538,6 +538,7 @@ tsunami_init()
 static int
 tsunami_probe(device_t dev)
 {
+	device_t child;
 	int *hose;
 	int i;
 	if (tsunami0)
@@ -555,7 +556,8 @@ tsunami_probe(device_t dev)
 	for(i = 0; i < num_pchips; i++) {
 		hose = malloc(sizeof(int), M_DEVBUF, M_NOWAIT);
 		*hose = i;
-		device_add_child(dev, "pcib", i, hose);
+		child = device_add_child(dev, "pcib", i);
+		device_set_ivars(child, hose);
 		pchip_init(pchip[i], i);		
 	}
 
diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c
index 634260c476d6..87ea86770a82 100644
--- a/sys/alpha/pci/tsunami_pci.c
+++ b/sys/alpha/pci/tsunami_pci.c
@@ -70,7 +70,7 @@ tsunami_pcib_probe(device_t dev)
 
 	device_set_desc(dev, "21271 PCI host bus adapter");
 
-	child = device_add_child(dev, "pci", -1, 0);
+	child = device_add_child(dev, "pci", -1);
 
 	if(hoseno)
 		tsunami_hoses[hoseno] = device_get_unit(child);