make attachments use pre-existing activate functions; ok deraadt@

10 files changed, 29 insertions, 19 deletions

diff --git a/sys/arch/powerpc64/dev/ipmi_opal.c b/sys/arch/powerpc64/dev/ipmi_opal.c
index d5449be20aa..028edcf5ff2 100644
--- a/sys/arch/powerpc64/dev/ipmi_opal.c
+++ b/sys/arch/powerpc64/dev/ipmi_opal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_opal.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
+/*	$OpenBSD: ipmi_opal.c,v 1.4 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -61,7 +61,8 @@ int	ipmi_opal_match(struct device *, void *, void *);
 void	ipmi_opal_attach(struct device *, struct device *, void *);
 
 const struct cfattach ipmi_opal_ca = {
-	sizeof (struct ipmi_opal_softc), ipmi_opal_match, ipmi_opal_attach
+	sizeof (struct ipmi_opal_softc), ipmi_opal_match, ipmi_opal_attach,
+	NULL, ipmi_activate
 };
 
 int
diff --git a/sys/dev/acpi/ahci_acpi.c b/sys/dev/acpi/ahci_acpi.c
index 9fa71439655..cd1bc63a3bd 100644
--- a/sys/dev/acpi/ahci_acpi.c
+++ b/sys/dev/acpi/ahci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci_acpi.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
+/*	$OpenBSD: ahci_acpi.c,v 1.6 2024/10/09 00:38:25 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -40,7 +40,8 @@ int	ahci_acpi_match(struct device *, void *, void *);
 void	ahci_acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach ahci_acpi_ca = {
-	sizeof(struct ahci_acpi_softc), ahci_acpi_match, ahci_acpi_attach
+	sizeof(struct ahci_acpi_softc), ahci_acpi_match, ahci_acpi_attach,
+	NULL, ahci_activate
 };
 
 int
diff --git a/sys/dev/acpi/ehci_acpi.c b/sys/dev/acpi/ehci_acpi.c
index 047513b8acc..ce0ebc51c7c 100644
--- a/sys/dev/acpi/ehci_acpi.c
+++ b/sys/dev/acpi/ehci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_acpi.c,v 1.3 2022/06/28 08:15:04 kettenis Exp $	*/
+/*	$OpenBSD: ehci_acpi.c,v 1.4 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -47,7 +47,8 @@ int	ehci_acpi_match(struct device *, void *, void *);
 void	ehci_acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach ehci_acpi_ca = {
-	sizeof(struct ehci_acpi_softc), ehci_acpi_match, ehci_acpi_attach
+	sizeof(struct ehci_acpi_softc), ehci_acpi_match, ehci_acpi_attach,
+	NULL, ehci_activate
 };
 
 const char *ehci_hids[] = {
diff --git a/sys/dev/acpi/ipmi_acpi.c b/sys/dev/acpi/ipmi_acpi.c
index 25e2527a334..f7ab8f68b41 100644
--- a/sys/dev/acpi/ipmi_acpi.c
+++ b/sys/dev/acpi/ipmi_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipmi_acpi.c,v 1.5 2022/04/06 18:59:27 naddy Exp $ */
+/* $OpenBSD: ipmi_acpi.c,v 1.6 2024/10/09 00:38:25 jsg Exp $ */
 /*
  * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se>
  *
@@ -55,6 +55,7 @@ struct ipmi_acpi_softc {
 
 const struct cfattach ipmi_acpi_ca = {
 	sizeof(struct ipmi_acpi_softc), ipmi_acpi_match, ipmi_acpi_attach,
+	NULL, ipmi_activate
 };
 
 const char *ipmi_acpi_hids[] = { ACPI_DEV_IPMI, NULL };
diff --git a/sys/dev/acpi/ohci_acpi.c b/sys/dev/acpi/ohci_acpi.c
index c44f00882d2..39497e7059d 100644
--- a/sys/dev/acpi/ohci_acpi.c
+++ b/sys/dev/acpi/ohci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_acpi.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
+/*	$OpenBSD: ohci_acpi.c,v 1.3 2024/10/09 00:38:25 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -47,7 +47,8 @@ int	ohci_acpi_match(struct device *, void *, void *);
 void	ohci_acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach ohci_acpi_ca = {
-	sizeof(struct ohci_acpi_softc), ohci_acpi_match, ohci_acpi_attach
+	sizeof(struct ohci_acpi_softc), ohci_acpi_match, ohci_acpi_attach,
+	NULL, ohci_activate
 };
 
 void	ohci_acpi_attach_deferred(struct device *);
diff --git a/sys/dev/acpi/sdhc_acpi.c b/sys/dev/acpi/sdhc_acpi.c
index a3dc053d5e6..daf9e380a4b 100644
--- a/sys/dev/acpi/sdhc_acpi.c
+++ b/sys/dev/acpi/sdhc_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc_acpi.c,v 1.22 2022/10/08 19:46:52 kettenis Exp $	*/
+/*	$OpenBSD: sdhc_acpi.c,v 1.23 2024/10/09 00:38:25 jsg Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -51,7 +51,8 @@ int	sdhc_acpi_match(struct device *, void *, void *);
 void	sdhc_acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach sdhc_acpi_ca = {
-	sizeof(struct sdhc_acpi_softc), sdhc_acpi_match, sdhc_acpi_attach
+	sizeof(struct sdhc_acpi_softc), sdhc_acpi_match, sdhc_acpi_attach,
+	NULL, sdhc_activate
 };
 
 const char *sdhc_hids[] = {
diff --git a/sys/dev/acpi/xhci_acpi.c b/sys/dev/acpi/xhci_acpi.c
index ad504b46ba4..0df1d6ec2c4 100644
--- a/sys/dev/acpi/xhci_acpi.c
+++ b/sys/dev/acpi/xhci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xhci_acpi.c,v 1.12 2024/06/19 21:31:10 patrick Exp $	*/
+/*	$OpenBSD: xhci_acpi.c,v 1.13 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -47,7 +47,8 @@ int	xhci_acpi_match(struct device *, void *, void *);
 void	xhci_acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach xhci_acpi_ca = {
-	sizeof(struct xhci_acpi_softc), xhci_acpi_match, xhci_acpi_attach
+	sizeof(struct xhci_acpi_softc), xhci_acpi_match, xhci_acpi_attach,
+	NULL, xhci_activate
 };
 
 const char *xhci_hids[] = {
diff --git a/sys/dev/fdt/ipmi_fdt.c b/sys/dev/fdt/ipmi_fdt.c
index d2f7723f20c..e74b8f8428d 100644
--- a/sys/dev/fdt/ipmi_fdt.c
+++ b/sys/dev/fdt/ipmi_fdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_fdt.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
+/*	$OpenBSD: ipmi_fdt.c,v 1.3 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -31,7 +31,8 @@ int	ipmi_fdt_match(struct device *, void *, void *);
 void	ipmi_fdt_attach(struct device *, struct device *, void *);
 
 const struct cfattach ipmi_fdt_ca = {
-	sizeof (struct ipmi_softc), ipmi_fdt_match, ipmi_fdt_attach
+	sizeof (struct ipmi_softc), ipmi_fdt_match, ipmi_fdt_attach,
+	NULL, ipmi_activate
 };
 
 int
diff --git a/sys/dev/fdt/sdhc_fdt.c b/sys/dev/fdt/sdhc_fdt.c
index e71e00cb85e..f898383748f 100644
--- a/sys/dev/fdt/sdhc_fdt.c
+++ b/sys/dev/fdt/sdhc_fdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc_fdt.c,v 1.20 2023/04/08 05:40:54 jsg Exp $	*/
+/*	$OpenBSD: sdhc_fdt.c,v 1.21 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2017 Mark Kettenis
  *
@@ -111,7 +111,8 @@ int	sdhc_fdt_match(struct device *, void *, void *);
 void	sdhc_fdt_attach(struct device *, struct device *, void *);
 
 const struct cfattach sdhc_fdt_ca = {
-	sizeof(struct sdhc_fdt_softc), sdhc_fdt_match, sdhc_fdt_attach
+	sizeof(struct sdhc_fdt_softc), sdhc_fdt_match, sdhc_fdt_attach,
+	NULL, sdhc_activate
 };
 
 int	sdhc_fdt_card_detect(struct sdhc_softc *);
diff --git a/sys/dev/i2c/ipmi_i2c.c b/sys/dev/i2c/ipmi_i2c.c
index d1859060514..e5ceb1fdcd7 100644
--- a/sys/dev/i2c/ipmi_i2c.c
+++ b/sys/dev/i2c/ipmi_i2c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_i2c.c,v 1.5 2024/07/22 14:03:22 jsg Exp $	*/
+/*	$OpenBSD: ipmi_i2c.c,v 1.6 2024/10/09 00:38:26 jsg Exp $	*/
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -56,7 +56,8 @@ int	ipmi_i2c_match(struct device *, void *, void *);
 void	ipmi_i2c_attach(struct device *, struct device *, void *);
 
 const struct cfattach ipmi_i2c_ca = {
-	sizeof(struct ipmi_i2c_softc), ipmi_i2c_match, ipmi_i2c_attach
+	sizeof(struct ipmi_i2c_softc), ipmi_i2c_match, ipmi_i2c_attach,
+	NULL, ipmi_activate
 };
 
 int	ipmi_i2c_get_interface_caps(struct ipmi_i2c_softc *);