don't need to put config_activate_children inside cfattach, because

NULL means the same
ok kettenis

diff --git a/sys/arch/arm/cortex/cortex.c b/sys/arch/arm/cortex/cortex.c
index 3a55612..9666b42 100644 (file)
--- a/sys/arch/arm/cortex/cortex.c
+++ b/sys/arch/arm/cortex/cortex.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cortex.c,v 1.7 2022/03/12 14:40:41 mpi Exp $  */
+/*     $OpenBSD: cortex.c,v 1.8 2024/08/18 15:50:47 deraadt Exp $      */
 /* $NetBSD: mainbus.c,v 1.3 2001/06/13 17:52:43 nathanw Exp $ */
 
 /*
@@ -81,8 +81,7 @@ int cortexsearch(struct device *,  void *, void *);
 /* attach and device structures for the device */
 
 const struct cfattach cortex_ca = {
-       sizeof(struct device), cortexmatch, cortexattach, NULL,
-       config_activate_children
+       sizeof(struct device), cortexmatch, cortexattach
 };
 
 struct cfdriver cortex_cd = {

diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c
index e5badd4..2ab91e7 100644 (file)
--- a/sys/arch/arm/mainbus/mainbus.c
+++ b/sys/arch/arm/mainbus/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.24 2022/03/12 14:40:41 mpi Exp $ */
+/* $OpenBSD: mainbus.c,v 1.25 2024/08/18 15:50:49 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -51,8 +51,7 @@ struct mainbus_softc {
 };
 
 const struct cfattach mainbus_ca = {
-       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
-       config_activate_children
+       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach
 };
 
 struct cfdriver mainbus_cd = {

diff --git a/sys/arch/arm64/dev/mainbus.c b/sys/arch/arm64/dev/mainbus.c
index d3b8bcb..b3a7da2 100644 (file)
--- a/sys/arch/arm64/dev/mainbus.c
+++ b/sys/arch/arm64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.29 2024/01/29 14:52:25 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.30 2024/08/18 15:50:49 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -60,8 +60,7 @@ struct mainbus_softc {
 };
 
 const struct cfattach mainbus_ca = {
-       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
-       config_activate_children
+       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach
 };
 
 struct cfdriver mainbus_cd = {

diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index 347f56f..d876443 100644 (file)
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bios.c,v 1.129 2023/03/15 08:20:52 jsg Exp $  */
+/*     $OpenBSD: bios.c,v 1.130 2024/08/18 15:50:49 deraadt Exp $      */
 
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
@@ -81,8 +81,7 @@ int bios_print(void *, const char *);
 char *fixstring(char *);
 
 const struct cfattach bios_ca = {
-       sizeof(struct bios_softc), biosprobe, biosattach, NULL,
-       config_activate_children
+       sizeof(struct bios_softc), biosprobe, biosattach
 };
 
 struct cfdriver bios_cd = {

diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 62c6ca3..2e3b6ad 100644 (file)
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mainbus.c,v 1.61 2023/01/30 10:49:05 jsg Exp $        */
+/*     $OpenBSD: mainbus.c,v 1.62 2024/08/18 15:50:49 deraadt Exp $    */
 /*     $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $     */
 
 /*
@@ -84,8 +84,7 @@ int   mainbus_match(struct device *, void *, void *);
 void   mainbus_attach(struct device *, struct device *, void *);
 
 const struct cfattach mainbus_ca = {
-       sizeof(struct device), mainbus_match, mainbus_attach, NULL,
-       config_activate_children
+       sizeof(struct device), mainbus_match, mainbus_attach
 };
 
 struct cfdriver mainbus_cd = {

diff --git a/sys/arch/powerpc64/dev/mainbus.c b/sys/arch/powerpc64/dev/mainbus.c
index d3ac571..af7fef0 100644 (file)
--- a/sys/arch/powerpc64/dev/mainbus.c
+++ b/sys/arch/powerpc64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.6 2022/04/06 18:59:27 naddy Exp $ */
+/* $OpenBSD: mainbus.c,v 1.7 2024/08/18 15:50:49 deraadt Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -51,8 +51,7 @@ struct mainbus_softc {
 };
 
 const struct cfattach mainbus_ca = {
-       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
-       config_activate_children
+       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach
 };
 
 struct cfdriver mainbus_cd = {

diff --git a/sys/arch/riscv64/dev/mainbus.c b/sys/arch/riscv64/dev/mainbus.c
index 2fc54e3..b83626b 100644 (file)
--- a/sys/arch/riscv64/dev/mainbus.c
+++ b/sys/arch/riscv64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mainbus.c,v 1.10 2024/05/13 01:15:50 jsg Exp $ */
+/*     $OpenBSD: mainbus.c,v 1.11 2024/08/18 15:50:49 deraadt Exp $ */
 
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
@@ -53,8 +53,7 @@ struct mainbus_softc {
 };
 
 const struct cfattach mainbus_ca = {
-       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
-       config_activate_children
+       sizeof(struct mainbus_softc), mainbus_match, mainbus_attach
 };
 
 struct cfdriver mainbus_cd = {