constify struct cfattach

62 files changed, 127 insertions, 127 deletions

diff --git a/sys/arch/arm64/dev/acpiiort.c b/sys/arch/arm64/dev/acpiiort.c
index 93626c915c0..f00f6e11262 100644
--- a/sys/arch/arm64/dev/acpiiort.c
+++ b/sys/arch/arm64/dev/acpiiort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiiort.c,v 1.5 2021/11/26 15:21:26 patrick Exp $ */
+/* $OpenBSD: acpiiort.c,v 1.6 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -31,7 +31,7 @@ SIMPLEQ_HEAD(, acpiiort_smmu) acpiiort_smmu_list =
 int acpiiort_match(struct device *, void *, void *);
 void acpiiort_attach(struct device *, struct device *, void *);
 
-struct cfattach acpiiort_ca = {
+const struct cfattach acpiiort_ca = {
 	sizeof(struct device), acpiiort_match, acpiiort_attach
 };
 
diff --git a/sys/arch/arm64/dev/apldart.c b/sys/arch/arm64/dev/apldart.c
index 3f3b3bd26c8..0af654ba555 100644
--- a/sys/arch/arm64/dev/apldart.c
+++ b/sys/arch/arm64/dev/apldart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apldart.c,v 1.13 2022/03/14 13:08:32 kettenis Exp $	*/
+/*	$OpenBSD: apldart.c,v 1.14 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -150,7 +150,7 @@ void	apldart_dmamem_free(bus_dma_tag_t, struct apldart_dmamem *);
 int	apldart_match(struct device *, void *, void *);
 void	apldart_attach(struct device *, struct device *, void *);
 
-struct cfattach	apldart_ca = {
+const struct cfattach	apldart_ca = {
 	sizeof (struct apldart_softc), apldart_match, apldart_attach
 };
 
diff --git a/sys/arch/arm64/dev/apldog.c b/sys/arch/arm64/dev/apldog.c
index 94d116aaa40..74902912f5e 100644
--- a/sys/arch/arm64/dev/apldog.c
+++ b/sys/arch/arm64/dev/apldog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apldog.c,v 1.3 2022/01/13 08:59:10 kettenis Exp $	*/
+/*	$OpenBSD: apldog.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -57,7 +57,7 @@ struct apldog_softc *apldog_sc;
 int	apldog_match(struct device *, void *, void *);
 void	apldog_attach(struct device *, struct device *, void *);
 
-struct cfattach	apldog_ca = {
+const struct cfattach	apldog_ca = {
 	sizeof (struct apldog_softc), apldog_match, apldog_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplhidev.c b/sys/arch/arm64/dev/aplhidev.c
index 4368932d1e2..2b00f7e217d 100644
--- a/sys/arch/arm64/dev/aplhidev.c
+++ b/sys/arch/arm64/dev/aplhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplhidev.c,v 1.5 2022/02/14 00:53:40 jsg Exp $	*/
+/*	$OpenBSD: aplhidev.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2013-2014 joshua stein <jcs@openbsd.org>
@@ -131,7 +131,7 @@ struct aplhidev_softc {
 int	 aplhidev_match(struct device *, void *, void *);
 void	 aplhidev_attach(struct device *, struct device *, void *);
 
-struct cfattach aplhidev_ca = {
+const struct cfattach aplhidev_ca = {
 	sizeof(struct aplhidev_softc), aplhidev_match, aplhidev_attach
 };
 
@@ -429,7 +429,7 @@ const struct wskbd_accessops aplkbd_accessops = {
 int	 aplkbd_match(struct device *, void *, void *);
 void	 aplkbd_attach(struct device *, struct device *, void *);
 
-struct cfattach aplkbd_ca = {
+const struct cfattach aplkbd_ca = {
 	sizeof(struct aplkbd_softc), aplkbd_match, aplkbd_attach
 };
 
@@ -611,7 +611,7 @@ const struct wsmouse_accessops aplms_accessops = {
 int	 aplms_match(struct device *, void *, void *);
 void	 aplms_attach(struct device *, struct device *, void *);
 
-struct cfattach aplms_ca = {
+const struct cfattach aplms_ca = {
 	sizeof(struct aplms_softc), aplms_match, aplms_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplintc.c b/sys/arch/arm64/dev/aplintc.c
index 814a74f1d5d..20b9f3b349b 100644
--- a/sys/arch/arm64/dev/aplintc.c
+++ b/sys/arch/arm64/dev/aplintc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplintc.c,v 1.9 2022/03/31 18:47:04 kettenis Exp $	*/
+/*	$OpenBSD: aplintc.c,v 1.10 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis
  *
@@ -130,7 +130,7 @@ struct aplintc_softc *aplintc_sc;
 int	aplintc_match(struct device *, void *, void *);
 void	aplintc_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplintc_ca = {
+const struct cfattach	aplintc_ca = {
 	sizeof (struct aplintc_softc), aplintc_match, aplintc_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplns.c b/sys/arch/arm64/dev/aplns.c
index dbf7795960e..ddb085b576a 100644
--- a/sys/arch/arm64/dev/aplns.c
+++ b/sys/arch/arm64/dev/aplns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplns.c,v 1.10 2022/01/10 09:07:28 kettenis Exp $ */
+/*	$OpenBSD: aplns.c,v 1.11 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2014, 2021 David Gwynne <dlg@openbsd.org>
  *
@@ -83,7 +83,7 @@ struct ans_nvmmu_tcb {
 int	aplns_match(struct device *, void *, void *);
 void	aplns_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplns_ca = {
+const struct cfattach	aplns_ca = {
 	sizeof(struct device),
 	aplns_match,
 	aplns_attach
@@ -124,7 +124,7 @@ struct nvme_ans_softc {
 int	nvme_ans_match(struct device *, void *, void *);
 void	nvme_ans_attach(struct device *, struct device *, void *);
 
-struct cfattach nvme_ans_ca = {
+const struct cfattach nvme_ans_ca = {
 	sizeof(struct nvme_ans_softc),
 	nvme_ans_match,
 	nvme_ans_attach,
diff --git a/sys/arch/arm64/dev/aplpcie.c b/sys/arch/arm64/dev/aplpcie.c
index e2d6cc773b7..613469a166e 100644
--- a/sys/arch/arm64/dev/aplpcie.c
+++ b/sys/arch/arm64/dev/aplpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpcie.c,v 1.12 2022/03/07 11:08:13 kettenis Exp $	*/
+/*	$OpenBSD: aplpcie.c,v 1.13 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -135,7 +135,7 @@ struct aplpcie_softc {
 int	aplpcie_match(struct device *, void *, void *);
 void	aplpcie_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpcie_ca = {
+const struct cfattach	aplpcie_ca = {
 	sizeof (struct aplpcie_softc), aplpcie_match, aplpcie_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplpinctrl.c b/sys/arch/arm64/dev/aplpinctrl.c
index a090585fbf2..c02ccf48077 100644
--- a/sys/arch/arm64/dev/aplpinctrl.c
+++ b/sys/arch/arm64/dev/aplpinctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpinctrl.c,v 1.3 2021/12/23 20:48:24 patrick Exp $	*/
+/*	$OpenBSD: aplpinctrl.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -86,7 +86,7 @@ struct aplpinctrl_softc {
 int	aplpinctrl_match(struct device *, void *, void *);
 void	aplpinctrl_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpinctrl_ca = {
+const struct cfattach	aplpinctrl_ca = {
 	sizeof (struct aplpinctrl_softc), aplpinctrl_match, aplpinctrl_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplpmu.c b/sys/arch/arm64/dev/aplpmu.c
index 32794c61ab7..47df97b6dd9 100644
--- a/sys/arch/arm64/dev/aplpmu.c
+++ b/sys/arch/arm64/dev/aplpmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpmu.c,v 1.4 2022/03/02 12:35:14 kettenis Exp $	*/
+/*	$OpenBSD: aplpmu.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -74,7 +74,7 @@ struct aplpmu_softc *aplpmu_sc;
 int	aplpmu_match(struct device *, void *, void *);
 void	aplpmu_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpmu_ca = {
+const struct cfattach	aplpmu_ca = {
 	sizeof (struct aplpmu_softc), aplpmu_match, aplpmu_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplspi.c b/sys/arch/arm64/dev/aplspi.c
index 224a50276c8..248bf28edb9 100644
--- a/sys/arch/arm64/dev/aplspi.c
+++ b/sys/arch/arm64/dev/aplspi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplspi.c,v 1.3 2021/12/11 20:04:37 kettenis Exp $	*/
+/*	$OpenBSD: aplspi.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -101,7 +101,7 @@ void	 aplspi_scan(struct aplspi_softc *);
 #define HCLR4(sc, reg, bits)						\
 	HWRITE4((sc), (reg), HREAD4((sc), (reg)) & ~(bits))
 
-struct cfattach aplspi_ca = {
+const struct cfattach aplspi_ca = {
 	sizeof(struct aplspi_softc), aplspi_match, aplspi_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplspmi.c b/sys/arch/arm64/dev/aplspmi.c
index 67854244fc9..f4a31f9c5eb 100644
--- a/sys/arch/arm64/dev/aplspmi.c
+++ b/sys/arch/arm64/dev/aplspmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplspmi.c,v 1.1 2021/05/26 20:52:21 kettenis Exp $	*/
+/*	$OpenBSD: aplspmi.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -61,7 +61,7 @@ struct aplspmi_softc {
 int	aplspmi_match(struct device *, void *, void *);
 void	aplspmi_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplspmi_ca = {
+const struct cfattach	aplspmi_ca = {
 	sizeof (struct aplspmi_softc), aplspmi_match, aplspmi_attach
 };
 
diff --git a/sys/arch/arm64/dev/smmu_acpi.c b/sys/arch/arm64/dev/smmu_acpi.c
index c6b30c4082f..72f888b6a10 100644
--- a/sys/arch/arm64/dev/smmu_acpi.c
+++ b/sys/arch/arm64/dev/smmu_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smmu_acpi.c,v 1.3 2021/06/25 17:41:22 patrick Exp $ */
+/* $OpenBSD: smmu_acpi.c,v 1.4 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -37,7 +37,7 @@ struct smmu_acpi_softc {
 int smmu_acpi_match(struct device *, void *, void *);
 void smmu_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach smmu_acpi_ca = {
+const struct cfattach smmu_acpi_ca = {
 	sizeof(struct smmu_acpi_softc), smmu_acpi_match, smmu_acpi_attach
 };
 
diff --git a/sys/arch/arm64/dev/smmu_fdt.c b/sys/arch/arm64/dev/smmu_fdt.c
index cbf872d5d36..9a0819cda94 100644
--- a/sys/arch/arm64/dev/smmu_fdt.c
+++ b/sys/arch/arm64/dev/smmu_fdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smmu_fdt.c,v 1.4 2021/06/25 17:41:22 patrick Exp $ */
+/* $OpenBSD: smmu_fdt.c,v 1.5 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -44,7 +44,7 @@ void smmu_fdt_attach(struct device *, struct device *, void *);
 bus_dma_tag_t smmu_fdt_map(void *, uint32_t *, bus_dma_tag_t);
 void smmu_fdt_reserve(void *, uint32_t *, bus_addr_t, bus_size_t);
 
-struct cfattach smmu_fdt_ca = {
+const struct cfattach smmu_fdt_ca = {
 	sizeof(struct smmu_fdt_softc), smmu_fdt_match, smmu_fdt_attach
 };
 
diff --git a/sys/arch/armv7/omap/omclock.c b/sys/arch/armv7/omap/omclock.c
index ab93cf278ab..9f37b275c38 100644
--- a/sys/arch/armv7/omap/omclock.c
+++ b/sys/arch/armv7/omap/omclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omclock.c,v 1.1 2020/04/10 22:02:45 kettenis Exp $	*/
+/*	$OpenBSD: omclock.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -56,7 +56,7 @@ struct omclock_softc {
 int	omclock_match(struct device *, void *, void *);
 void	omclock_attach(struct device *, struct device *, void *);
 
-struct cfattach	omclock_ca = {
+const struct cfattach omclock_ca = {
 	sizeof (struct omclock_softc), omclock_match, omclock_attach
 };
 
diff --git a/sys/arch/armv7/omap/omcm.c b/sys/arch/armv7/omap/omcm.c
index c9e1c77e565..6a8c03c82c0 100644
--- a/sys/arch/armv7/omap/omcm.c
+++ b/sys/arch/armv7/omap/omcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omcm.c,v 1.2 2021/03/25 04:12:01 jsg Exp $ */
+/* $OpenBSD: omcm.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -31,7 +31,7 @@ struct omcm_softc {
 int	omcm_match(struct device *, void *, void *);
 void	omcm_attach(struct device *, struct device *, void *);
 
-struct cfattach omcm_ca = {
+const struct cfattach omcm_ca = {
 	sizeof(struct omcm_softc), omcm_match, omcm_attach
 };
 
diff --git a/sys/arch/armv7/omap/omrng.c b/sys/arch/armv7/omap/omrng.c
index 99a8c58a54d..b75a368eb15 100644
--- a/sys/arch/armv7/omap/omrng.c
+++ b/sys/arch/armv7/omap/omrng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omrng.c,v 1.2 2020/05/29 04:42:23 deraadt Exp $	*/
+/*	$OpenBSD: omrng.c,v 1.3 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2018, 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -72,7 +72,7 @@ struct omrng_softc {
 int	omrng_match(struct device *, void *, void *);
 void	omrng_attach(struct device *, struct device *, void *);
 
-struct cfattach	omrng_ca = {
+const struct cfattach omrng_ca = {
 	sizeof (struct omrng_softc), omrng_match, omrng_attach
 };
 
diff --git a/sys/arch/armv7/omap/omsysc.c b/sys/arch/armv7/omap/omsysc.c
index 6862659461f..ba97e3face0 100644
--- a/sys/arch/armv7/omap/omsysc.c
+++ b/sys/arch/armv7/omap/omsysc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omsysc.c,v 1.2 2021/03/25 04:12:01 jsg Exp $ */
+/* $OpenBSD: omsysc.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -33,7 +33,7 @@ struct omsysc_softc {
 int	omsysc_match(struct device *, void *, void *);
 void	omsysc_attach(struct device *, struct device *, void *);
 
-struct cfattach omsysc_ca = {
+const struct cfattach omsysc_ca = {
 	sizeof(struct omsysc_softc), omsysc_match, omsysc_attach
 };
 
diff --git a/sys/arch/landisk/dev/obio.c b/sys/arch/landisk/dev/obio.c
index b5681174e97..f1a396b0f0d 100644
--- a/sys/arch/landisk/dev/obio.c
+++ b/sys/arch/landisk/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obio.c,v 1.9 2014/11/16 12:30:57 deraadt Exp $	*/
+/*	$OpenBSD: obio.c,v 1.10 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: obio.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -52,7 +52,7 @@ void	obio_attach(struct device *, struct device *, void *);
 int	obio_print(void *, const char *);
 int	obio_search(struct device *, void *, void *);
 
-struct cfattach obio_ca = {
+const struct cfattach obio_ca = {
 	sizeof(struct obio_softc), obio_match, obio_attach
 };
 
diff --git a/sys/arch/landisk/dev/power.c b/sys/arch/landisk/dev/power.c
index 2ec1c653bf0..f5fd23664d7 100644
--- a/sys/arch/landisk/dev/power.c
+++ b/sys/arch/landisk/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: power.c,v 1.9 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Martin Reindl.
@@ -41,7 +41,7 @@ int	power_match(struct device *, void *, void *);
 void	power_attach(struct device *, struct device *, void *);
 int	power_intr(void *aux);
 
-struct cfattach power_ca = {
+const struct cfattach power_ca = {
 	sizeof(struct power_softc),
 	power_match,
 	power_attach
diff --git a/sys/arch/landisk/dev/wdc_obio.c b/sys/arch/landisk/dev/wdc_obio.c
index e82ca7c6cf3..790bd69f5ee 100644
--- a/sys/arch/landisk/dev/wdc_obio.c
+++ b/sys/arch/landisk/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_obio.c,v 1.4 2011/05/09 22:33:53 matthew Exp $	*/
+/*	$OpenBSD: wdc_obio.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: wdc_obio.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -54,7 +54,7 @@ struct wdc_obio_softc {
 int	wdc_obio_match(struct device *, void *, void *);
 void	wdc_obio_attach(struct device *, struct device *, void *);
 
-struct cfattach wdc_obio_ca = {
+const struct cfattach wdc_obio_ca = {
 	sizeof(struct wdc_obio_softc), wdc_obio_match, wdc_obio_attach
 };
 
diff --git a/sys/arch/landisk/landisk/mainbus.c b/sys/arch/landisk/landisk/mainbus.c
index c34f84516fb..04027342cde 100644
--- a/sys/arch/landisk/landisk/mainbus.c
+++ b/sys/arch/landisk/landisk/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.5 2010/04/21 12:39:39 jasper Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 int mainbus_match(struct device *, void *, void *);
 void mainbus_attach(struct device *, struct device *, void *);
 
-struct cfattach mainbus_ca = {
+const struct cfattach mainbus_ca = {
 	sizeof(struct device), mainbus_match, mainbus_attach
 };
 
diff --git a/sys/arch/loongson/dev/apm.c b/sys/arch/loongson/dev/apm.c
index 2d0fea5dc1d..81c484eb602 100644
--- a/sys/arch/loongson/dev/apm.c
+++ b/sys/arch/loongson/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.39 2020/12/25 12:59:51 visa Exp $	*/
+/*	$OpenBSD: apm.c,v 1.40 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -72,7 +72,7 @@ struct apm_softc {
 int apmmatch(struct device *, void *, void *);
 void apmattach(struct device *, struct device *, void *);
 
-struct cfattach apm_ca = {
+const struct cfattach apm_ca = {
 	sizeof(struct apm_softc), apmmatch, apmattach
 };
 
diff --git a/sys/arch/loongson/dev/gdiumiic.c b/sys/arch/loongson/dev/gdiumiic.c
index b8832134549..b247a0e2eed 100644
--- a/sys/arch/loongson/dev/gdiumiic.c
+++ b/sys/arch/loongson/dev/gdiumiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdiumiic.c,v 1.7 2020/09/30 22:23:41 patrick Exp $	*/
+/*	$OpenBSD: gdiumiic.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -78,7 +78,7 @@ int		gdiumiic_bustype(struct gpio_attach_args *);
 void		gdiumiic_sensors_scan(struct device *,
 		    struct i2cbus_attach_args *, void *);
 
-struct cfattach gdiumiic_ca = {
+const struct cfattach gdiumiic_ca = {
 	sizeof(struct gdiumiic_softc),
 	gdiumiic_match,
 	gdiumiic_attach,
diff --git a/sys/arch/loongson/dev/glxclk.c b/sys/arch/loongson/dev/glxclk.c
index 5b8429e0889..c2f1c41ff6c 100644
--- a/sys/arch/loongson/dev/glxclk.c
+++ b/sys/arch/loongson/dev/glxclk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glxclk.c,v 1.5 2015/07/19 21:11:47 jasper Exp $	*/
+/*	$OpenBSD: glxclk.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2013 Paul Irofti.
@@ -50,7 +50,7 @@ int	glxclk_intr(void *);
 int	glxclk_stat_intr(void *arg);
 void	glxclk_startclock(struct cpu_info *);
 
-struct cfattach glxclk_ca = {
+const struct cfattach glxclk_ca = {
 	sizeof(struct glxclk_softc), glxclk_match, glxclk_attach,
 };
 
diff --git a/sys/arch/loongson/dev/mcclock_isa.c b/sys/arch/loongson/dev/mcclock_isa.c
index b69a0a446ea..d01430dcf08 100644
--- a/sys/arch/loongson/dev/mcclock_isa.c
+++ b/sys/arch/loongson/dev/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock_isa.c,v 1.2 2020/05/25 13:16:06 visa Exp $	*/
+/*	$OpenBSD: mcclock_isa.c,v 1.3 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ struct mcclock_isa_softc {
 int	mcclock_isa_match(struct device *, void *, void *);
 void	mcclock_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach mcclock_isa_ca = {
+const struct cfattach mcclock_isa_ca = {
 	sizeof (struct mcclock_isa_softc), mcclock_isa_match,
 	    mcclock_isa_attach, 
 };
diff --git a/sys/arch/loongson/dev/ohci_voyager.c b/sys/arch/loongson/dev/ohci_voyager.c
index ee168228ac3..875ecfc5648 100644
--- a/sys/arch/loongson/dev/ohci_voyager.c
+++ b/sys/arch/loongson/dev/ohci_voyager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_voyager.c,v 1.7 2019/01/07 03:41:06 dlg Exp $	*/
+/*	$OpenBSD: ohci_voyager.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 /*	OpenBSD: ohci_pci.c,v 1.33 2008/06/26 05:42:17 ray Exp 	*/
 /*	$NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $	*/
 
@@ -72,7 +72,7 @@ struct ohci_voyager_softc {
 	void 			*sc_ih;
 };
 
-struct cfattach ohci_voyager_ca = {
+const struct cfattach ohci_voyager_ca = {
 	sizeof(struct ohci_voyager_softc),
 	ohci_voyager_match, ohci_voyager_attach, NULL, ohci_activate
 };
diff --git a/sys/arch/luna88k/cbus/i82365_cbus.c b/sys/arch/luna88k/cbus/i82365_cbus.c
index 4d73a057ba6..441fddd2da4 100644
--- a/sys/arch/luna88k/cbus/i82365_cbus.c
+++ b/sys/arch/luna88k/cbus/i82365_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_cbus.c,v 1.6 2019/06/30 00:23:22 aoyama Exp $	*/
+/*	$OpenBSD: i82365_cbus.c,v 1.7 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ struct luna88k_bus_space_tag pcic_cbus_mem_bst = {
 	.bs_flags = TAG_LITTLE_ENDIAN
 };
 
-struct cfattach pcic_cbus_ca = {
+const struct cfattach pcic_cbus_ca = {
 	sizeof(struct pcic_softc), pcic_cbus_probe, pcic_cbus_attach
 };
 
diff --git a/sys/arch/luna88k/cbus/if_ne_cbus.c b/sys/arch/luna88k/cbus/if_ne_cbus.c
index a3e222d2bf1..bd705f26ea4 100644
--- a/sys/arch/luna88k/cbus/if_ne_cbus.c
+++ b/sys/arch/luna88k/cbus/if_ne_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_cbus.c,v 1.1 2019/12/30 12:16:12 aoyama Exp $	*/
+/*	$OpenBSD: if_ne_cbus.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -104,7 +104,7 @@ struct ne_cbus_softc {
 	void	*sc_ih;				/* interrupt cookie */
 };
 
-struct cfattach ne_cbus_ca = {
+const struct cfattach ne_cbus_ca = {
 	sizeof(struct ne_cbus_softc), ne_cbus_match, ne_cbus_attach
 };
 
diff --git a/sys/arch/luna88k/cbus/necsb.c b/sys/arch/luna88k/cbus/necsb.c
index 34759ccbf88..6fbfbccd793 100644
--- a/sys/arch/luna88k/cbus/necsb.c
+++ b/sys/arch/luna88k/cbus/necsb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: necsb.c,v 1.4 2017/03/16 18:13:43 miod Exp $	*/
+/*	$OpenBSD: necsb.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NecBSD: nec86_isa.c,v 1.9 1998/09/26 11:31:11 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -53,7 +53,7 @@
 int	necsb_match(struct device *, void *, void *);
 void	necsb_attach(struct device *, struct device *, void *);
 
-struct cfattach necsb_ca = {
+const struct cfattach necsb_ca = {
 	sizeof(struct nec86_softc), necsb_match, necsb_attach
 };
 
diff --git a/sys/arch/luna88k/dev/spc.c b/sys/arch/luna88k/dev/spc.c
index 30978779150..91113f2ee10 100644
--- a/sys/arch/luna88k/dev/spc.c
+++ b/sys/arch/luna88k/dev/spc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spc.c,v 1.11 2020/02/05 16:29:29 krw Exp $ */
+/* $OpenBSD: spc.c,v 1.12 2022/04/06 18:59:26 naddy Exp $ */
 /* $NetBSD: spc.c,v 1.4 2003/07/05 19:00:17 tsutsui Exp $ */
 
 /*-
@@ -51,7 +51,7 @@
 int  spc_mainbus_match(struct device *, void *, void *);
 void spc_mainbus_attach(struct device *, struct device *, void *);
 
-struct cfattach spc_ca = {
+const struct cfattach spc_ca = {
 	sizeof(struct spc_softc), spc_mainbus_match, spc_mainbus_attach
 };
 
diff --git a/sys/arch/luna88k/dev/timekeeper.c b/sys/arch/luna88k/dev/timekeeper.c
index b08dfe4d287..925d94db866 100644
--- a/sys/arch/luna88k/dev/timekeeper.c
+++ b/sys/arch/luna88k/dev/timekeeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timekeeper.c,v 1.10 2017/11/03 06:54:06 aoyama Exp $ */
+/* $OpenBSD: timekeeper.c,v 1.11 2022/04/06 18:59:26 naddy Exp $ */
 /* $NetBSD: timekeeper.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
 
 /*-
@@ -64,7 +64,7 @@ struct timekeeper_softc {
 int  clock_match(struct device *, void *, void *);
 void clock_attach(struct device *, struct device *, void *);
 
-struct cfattach clock_ca = {
+const struct cfattach clock_ca = {
 	sizeof (struct timekeeper_softc), clock_match, clock_attach
 };
 
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 0f384ba3f08..a4175ee8739 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.32 2022/02/22 01:15:01 guenther Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.33 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -298,7 +298,7 @@ struct mc_softc {
 int	mc_match(struct device *, void *, void *);
 void	mc_attach(struct device *, struct device *, void *);
 
-struct  cfattach mc_ca = {
+const struct cfattach mc_ca = {
 	sizeof(struct mc_softc), mc_match, mc_attach
 };
 
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c
index 05ca4fce5e0..796b45514c1 100644
--- a/sys/arch/mips64/mips64/clock.c
+++ b/sys/arch/mips64/mips64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.44 2021/05/01 16:11:11 visa Exp $ */
+/*	$OpenBSD: clock.c,v 1.45 2022/04/06 18:59:26 naddy Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -55,7 +55,7 @@ struct cfdriver clock_cd = {
 	NULL, "clock", DV_DULL
 };
 
-struct cfattach clock_ca = {
+const struct cfattach clock_ca = {
 	sizeof(struct device), clockmatch, clockattach
 };
 
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c
index 60387228fa9..83f75fb8c4d 100644
--- a/sys/arch/mips64/mips64/cpu.c
+++ b/sys/arch/mips64/mips64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.81 2021/11/26 14:45:13 jsg Exp $ */
+/*	$OpenBSD: cpu.c,v 1.82 2022/04/06 18:59:26 naddy Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se)
@@ -54,7 +54,7 @@ vaddr_t	cache_valias_mask;
 int	cpu_has_synced_cp0_count;
 int	cpu_has_userlocal;
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpumatch, cpuattach
 };
 struct cfdriver cpu_cd = {
diff --git a/sys/arch/octeon/dev/amdcf.c b/sys/arch/octeon/dev/amdcf.c
index 48314d581fa..f3053f19d9a 100644
--- a/sys/arch/octeon/dev/amdcf.c
+++ b/sys/arch/octeon/dev/amdcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdcf.c,v 1.7 2021/01/30 14:59:13 visa Exp $	*/
+/*	$OpenBSD: amdcf.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007, Juniper Networks, Inc.
@@ -173,7 +173,7 @@ int	amdcf_match(struct device *, void *, void *);
 void	amdcf_attach(struct device *, struct device *, void *);
 int	amdcf_detach(struct device *, int);
 
-struct cfattach amdcf_ca = {
+const struct cfattach amdcf_ca = {
 	sizeof(struct amdcf_softc), amdcf_match, amdcf_attach, amdcf_detach
 };
 
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index a59f0effc49..4c28f634e11 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.51 2021/03/11 11:16:59 jsg Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.52 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -153,7 +153,7 @@ struct cn30xxgmx_port_ops *cn30xxgmx_port_ops[] = {
 	[GMX_AGL_PORT] = &cn30xxgmx_port_ops_agl,
 };
 
-struct cfattach octgmx_ca = {sizeof(struct cn30xxgmx_softc),
+const struct cfattach octgmx_ca = {sizeof(struct cn30xxgmx_softc),
     cn30xxgmx_match, cn30xxgmx_attach, NULL, NULL};
 
 struct cfdriver octgmx_cd = {NULL, "octgmx", DV_DULL};
diff --git a/sys/arch/octeon/dev/cn30xxuart.c b/sys/arch/octeon/dev/cn30xxuart.c
index 7e258b2ec1e..c1a32ba92df 100644
--- a/sys/arch/octeon/dev/cn30xxuart.c
+++ b/sys/arch/octeon/dev/cn30xxuart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxuart.c,v 1.12 2019/09/28 22:20:25 deraadt Exp $	*/
+/*	$OpenBSD: cn30xxuart.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -54,7 +54,7 @@ int	cn30xxuart_probe(struct device *, void *, void *);
 void	cn30xxuart_attach(struct device *, struct device *, void *);
 int	cn30xxuart_intr(void *);
 
-struct cfattach octuart_ca = {
+const struct cfattach octuart_ca = {
 	sizeof(struct com_softc), cn30xxuart_probe, cn30xxuart_attach
 };
 
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index cd8ac8bb5fb..de167f8b5ae 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octcf.c,v 1.33 2021/03/11 11:16:59 jsg Exp $ */
+/*	$OpenBSD: octcf.c,v 1.34 2022/04/06 18:59:27 naddy Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -125,7 +125,7 @@ int	octcfdetach(struct device *, int);
 int	octcfactivate(struct device *, int);
 int	octcfprint(void *, char *);
 
-struct cfattach octcf_ca = {
+const struct cfattach octcf_ca = {
 	sizeof(struct octcf_softc), octcfprobe, octcfattach,
 	octcfdetach, octcfactivate
 };
diff --git a/sys/arch/octeon/dev/octeon_iobus.c b/sys/arch/octeon/dev/octeon_iobus.c
index 0a3e42c6cd8..00ade446394 100644
--- a/sys/arch/octeon/dev/octeon_iobus.c
+++ b/sys/arch/octeon/dev/octeon_iobus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_iobus.c,v 1.25 2019/09/15 07:15:14 visa Exp $ */
+/*	$OpenBSD: octeon_iobus.c,v 1.26 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -89,7 +89,7 @@ void	 iobus_write_raw_8(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
 bus_addr_t iobus_pa_to_device(paddr_t);
 paddr_t	 iobus_device_to_pa(bus_addr_t);
 
-struct cfattach iobus_ca = {
+const struct cfattach iobus_ca = {
 	sizeof(struct device), iobusmatch, iobusattach
 };
 
diff --git a/sys/arch/octeon/dev/octrng.c b/sys/arch/octeon/dev/octrng.c
index 9ed86f26833..490f9f09134 100644
--- a/sys/arch/octeon/dev/octrng.c
+++ b/sys/arch/octeon/dev/octrng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrng.c,v 1.9 2020/05/29 04:42:24 deraadt Exp $	*/
+/*	$OpenBSD: octrng.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2013 Paul Irofti <paul@irofti.net>
  *
@@ -57,7 +57,7 @@ struct octrng_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-struct cfattach octrng_ca = {
+const struct cfattach octrng_ca = {
 	sizeof(struct octrng_softc), octrng_match, octrng_attach
 };
 
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c
index ecb28194147..e23b6ad3cc3 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrtc.c,v 1.13 2021/01/30 14:59:13 visa Exp $	*/
+/*	$OpenBSD: octrtc.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2013, 2014 Paul Irofti.
@@ -56,7 +56,7 @@ int	octrtc_settime(struct todr_chip_handle *, struct timeval *);
 int	octrtc_write(uint8_t);
 
 
-struct cfattach octrtc_ca = {
+const struct cfattach octrtc_ca = {
 	sizeof(struct octrtc_softc), octrtc_match, octrtc_attach,
 };
 
diff --git a/sys/arch/powerpc64/dev/astfb.c b/sys/arch/powerpc64/dev/astfb.c
index 0b193f4e82d..398b9288ad7 100644
--- a/sys/arch/powerpc64/dev/astfb.c
+++ b/sys/arch/powerpc64/dev/astfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: astfb.c,v 1.3 2020/10/30 13:36:45 kettenis Exp $	*/
+/*	$OpenBSD: astfb.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis.
@@ -70,7 +70,7 @@ struct wsdisplay_accessops astfb_accessops = {
 int	astfb_match(struct device *, void *, void *);
 void	astfb_attach(struct device *, struct device *, void *);
 
-struct cfattach astfb_ca = {
+const struct cfattach astfb_ca = {
 	sizeof(struct astfb_softc), astfb_match, astfb_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/ipmi_opal.c b/sys/arch/powerpc64/dev/ipmi_opal.c
index 25efc894fe6..d5449be20aa 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.2 2022/02/22 13:34:23 visa Exp $	*/
+/*	$OpenBSD: ipmi_opal.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -60,7 +60,7 @@ struct ipmi_if opal_if = {
 int	ipmi_opal_match(struct device *, void *, void *);
 void	ipmi_opal_attach(struct device *, struct device *, void *);
 
-struct cfattach ipmi_opal_ca = {
+const struct cfattach ipmi_opal_ca = {
 	sizeof (struct ipmi_opal_softc), ipmi_opal_match, ipmi_opal_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/mainbus.c b/sys/arch/powerpc64/dev/mainbus.c
index 211d3e1a480..d3ac571f4c0 100644
--- a/sys/arch/powerpc64/dev/mainbus.c
+++ b/sys/arch/powerpc64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.5 2020/08/26 03:29:06 visa Exp $ */
+/* $OpenBSD: mainbus.c,v 1.6 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -50,7 +50,7 @@ struct mainbus_softc {
 	int			 sc_early_nodes[64];
 };
 
-struct cfattach mainbus_ca = {
+const struct cfattach mainbus_ca = {
 	sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
 	config_activate_children
 };
diff --git a/sys/arch/powerpc64/dev/opal.c b/sys/arch/powerpc64/dev/opal.c
index 78c636407c8..10418d13572 100644
--- a/sys/arch/powerpc64/dev/opal.c
+++ b/sys/arch/powerpc64/dev/opal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opal.c,v 1.12 2021/01/23 12:10:08 kettenis Exp $	*/
+/*	$OpenBSD: opal.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -64,7 +64,7 @@ struct opal_softc *opal_sc;
 int	opal_match(struct device *, void *, void *);
 void	opal_attach(struct device *, struct device *, void *);
 
-struct cfattach	opal_ca = {
+const struct cfattach opal_ca = {
 	sizeof (struct opal_softc), opal_match, opal_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/opalcons.c b/sys/arch/powerpc64/dev/opalcons.c
index ce628f75cd7..7dc5ca9eb42 100644
--- a/sys/arch/powerpc64/dev/opalcons.c
+++ b/sys/arch/powerpc64/dev/opalcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opalcons.c,v 1.3 2020/10/30 13:26:29 kettenis Exp $	*/
+/*	$OpenBSD: opalcons.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -43,7 +43,7 @@ struct opalcons_softc {
 int	opalcons_match(struct device *, void *, void *);
 void	opalcons_attach(struct device *, struct device *, void *);
 
-struct cfattach	opalcons_ca = {
+const struct cfattach opalcons_ca = {
 	sizeof (struct opalcons_softc), opalcons_match, opalcons_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/opalsens.c b/sys/arch/powerpc64/dev/opalsens.c
index 0e84b57a5d1..b5215612b39 100644
--- a/sys/arch/powerpc64/dev/opalsens.c
+++ b/sys/arch/powerpc64/dev/opalsens.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opalsens.c,v 1.2 2020/07/15 07:15:00 kettenis Exp $	*/
+/*	$OpenBSD: opalsens.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -37,7 +37,7 @@ struct opalsens_softc {
 int	opalsens_match(struct device *, void *, void *);
 void	opalsens_attach(struct device *, struct device *, void *);
 
-struct cfattach	opalsens_ca = {
+const struct cfattach opalsens_ca = {
 	sizeof (struct opalsens_softc), opalsens_match, opalsens_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/phb.c b/sys/arch/powerpc64/dev/phb.c
index 8ab39523631..3fc145e015a 100644
--- a/sys/arch/powerpc64/dev/phb.c
+++ b/sys/arch/powerpc64/dev/phb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: phb.c,v 1.22 2022/02/21 11:15:09 jsg Exp $	*/
+/*	$OpenBSD: phb.c,v 1.23 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -100,7 +100,7 @@ void	phb_dmamem_free(bus_dma_tag_t, struct phb_dmamem *);
 int	phb_match(struct device *, void *, void *);
 void	phb_attach(struct device *, struct device *, void *);
 
-struct cfattach	phb_ca = {
+const struct cfattach phb_ca = {
 	sizeof (struct phb_softc), phb_match, phb_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xicp.c b/sys/arch/powerpc64/dev/xicp.c
index dd7ed80bf9b..92a97ebbdc6 100644
--- a/sys/arch/powerpc64/dev/xicp.c
+++ b/sys/arch/powerpc64/dev/xicp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xicp.c,v 1.4 2020/10/01 10:05:09 jsg Exp $	*/
+/*	$OpenBSD: xicp.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -88,7 +88,7 @@ xicp_write_4(struct xicp_softc *sc, bus_size_t off, uint32_t val)
 int	xicp_match(struct device *, void *, void *);
 void	xicp_attach(struct device *, struct device *, void *);
 
-struct cfattach	xicp_ca = {
+const struct cfattach xicp_ca = {
 	sizeof (struct xicp_softc), xicp_match, xicp_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xics.c b/sys/arch/powerpc64/dev/xics.c
index 9483b666137..2cc202e5abc 100644
--- a/sys/arch/powerpc64/dev/xics.c
+++ b/sys/arch/powerpc64/dev/xics.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xics.c,v 1.3 2020/09/21 11:14:28 kettenis Exp $	*/
+/*	$OpenBSD: xics.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -38,7 +38,7 @@ struct xics_softc {
 int	xics_match(struct device *, void *, void *);
 void	xics_attach(struct device *, struct device *, void *);
 
-struct cfattach	xics_ca = {
+const struct cfattach xics_ca = {
 	sizeof (struct xics_softc), xics_match, xics_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xive.c b/sys/arch/powerpc64/dev/xive.c
index 5955392c4f2..a6e6a0ae1ee 100644
--- a/sys/arch/powerpc64/dev/xive.c
+++ b/sys/arch/powerpc64/dev/xive.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xive.c,v 1.16 2021/06/02 19:38:14 kettenis Exp $	*/
+/*	$OpenBSD: xive.c,v 1.17 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -140,7 +140,7 @@ int	xive_match(struct device *, void *, void *);
 void	xive_attach(struct device *, struct device *, void *);
 int	xive_activate(struct device *, int);
 
-struct cfattach	xive_ca = {
+const struct cfattach xive_ca = {
 	sizeof (struct xive_softc), xive_match, xive_attach, NULL,
 	xive_activate
 };
diff --git a/sys/arch/powerpc64/powerpc64/cpu.c b/sys/arch/powerpc64/powerpc64/cpu.c
index 66a882214d0..bffdb01ba79 100644
--- a/sys/arch/powerpc64/powerpc64/cpu.c
+++ b/sys/arch/powerpc64/powerpc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.23 2021/08/01 17:42:56 kettenis Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.24 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -72,7 +72,7 @@ void	cpu_darn(void *);
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };
 
diff --git a/sys/arch/riscv64/dev/plic.c b/sys/arch/riscv64/dev/plic.c
index a9f53b5b622..6a863fedba3 100644
--- a/sys/arch/riscv64/dev/plic.c
+++ b/sys/arch/riscv64/dev/plic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: plic.c,v 1.9 2022/01/18 07:44:37 visa Exp $	*/
+/*	$OpenBSD: plic.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -133,7 +133,7 @@ void	plic_intr_enable_with_pri(int, uint32_t, int);
 void	plic_intr_disable(int, int);
 
 
-struct cfattach plic_ca = {
+const struct cfattach plic_ca = {
 	sizeof(struct plic_softc), plic_match, plic_attach,
 };
 
diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.c b/sys/arch/riscv64/dev/riscv_cpu_intc.c
index dcf4b51ba7e..c54133f7f81 100644
--- a/sys/arch/riscv64/dev/riscv_cpu_intc.c
+++ b/sys/arch/riscv64/dev/riscv_cpu_intc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: riscv_cpu_intc.c,v 1.9 2021/06/29 21:27:52 kettenis Exp $	*/
+/*	$OpenBSD: riscv_cpu_intc.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -47,7 +47,7 @@ void	*riscv_intc_intr_establish(int, int, int (*)(void *),
 void	riscv_intc_intr_disestablish(void *);
 
 
-struct cfattach intc_ca = {
+const struct cfattach intc_ca = {
 	sizeof (struct device), riscv_intc_match, riscv_intc_attach
 };
 
diff --git a/sys/arch/riscv64/dev/sfclock.c b/sys/arch/riscv64/dev/sfclock.c
index 9d9feb419bf..ba6c1b81a2e 100644
--- a/sys/arch/riscv64/dev/sfclock.c
+++ b/sys/arch/riscv64/dev/sfclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfclock.c,v 1.1 2021/06/17 16:10:50 kettenis Exp $	*/
+/*	$OpenBSD: sfclock.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -69,7 +69,7 @@ struct sfclock_softc {
 int	sfclock_match(struct device *, void *, void *);
 void	sfclock_attach(struct device *, struct device *, void *);
 
-struct cfattach	sfclock_ca = {
+const struct cfattach sfclock_ca = {
 	sizeof (struct sfclock_softc), sfclock_match, sfclock_attach
 };
 
diff --git a/sys/arch/riscv64/dev/sfuart.c b/sys/arch/riscv64/dev/sfuart.c
index f048ae88f69..5598a28159f 100644
--- a/sys/arch/riscv64/dev/sfuart.c
+++ b/sys/arch/riscv64/dev/sfuart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfuart.c,v 1.4 2021/08/31 12:24:15 jan Exp $	*/
+/*	$OpenBSD: sfuart.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -101,7 +101,7 @@ struct cfdriver sfuart_cd = {
 	NULL, "sfuart", DV_TTY
 };
 
-struct cfattach sfuart_ca = {
+const struct cfattach sfuart_ca = {
 	sizeof(struct sfuart_softc), sfuart_match, sfuart_attach
 };
 
diff --git a/sys/arch/riscv64/dev/simplebus.c b/sys/arch/riscv64/dev/simplebus.c
index 586accd1865..6325af6233e 100644
--- a/sys/arch/riscv64/dev/simplebus.c
+++ b/sys/arch/riscv64/dev/simplebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: simplebus.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
+/*	$OpenBSD: simplebus.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
@@ -36,7 +36,7 @@ int simplebus_bs_map(bus_space_tag_t, bus_addr_t, bus_size_t, int,
 int simplebus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
     bus_size_t, struct proc *, int, paddr_t *, int *, int);
 
-struct cfattach simplebus_ca = {
+const struct cfattach simplebus_ca = {
 	sizeof(struct simplebus_softc), simplebus_match, simplebus_attach
 };
 
diff --git a/sys/arch/riscv64/riscv64/cpu.c b/sys/arch/riscv64/riscv64/cpu.c
index ba29139cdc0..4996f3a25fa 100644
--- a/sys/arch/riscv64/riscv64/cpu.c
+++ b/sys/arch/riscv64/riscv64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.12 2021/11/26 14:45:13 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -74,7 +74,7 @@ struct cpu_info *cpu_info_list = &cpu_info_primary;
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };
 
diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c
index e7cb52db5c8..14e1254341d 100644
--- a/sys/arch/sh/dev/scif.c
+++ b/sys/arch/sh/dev/scif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scif.c,v 1.20 2021/01/01 10:21:26 jan Exp $	*/
+/*	$OpenBSD: scif.c,v 1.21 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
 
 /*-
@@ -225,7 +225,7 @@ unsigned int scifcn_speed = 9600;
 
 u_int scif_rbuf_size = SCIF_RING_SIZE;
 
-struct cfattach scif_ca = {
+const struct cfattach scif_ca = {
 	sizeof(struct scif_softc), scif_match, scif_attach
 };
 
diff --git a/sys/arch/sh/dev/shb.c b/sys/arch/sh/dev/shb.c
index c57a55f23a8..2e58a7b1b86 100644
--- a/sys/arch/sh/dev/shb.c
+++ b/sys/arch/sh/dev/shb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shb.c,v 1.2 2008/06/26 05:42:12 ray Exp $	*/
+/*	$OpenBSD: shb.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: shb.c,v 1.10 2005/12/11 12:18:58 christos Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@ void shb_attach(struct device *, struct device *, void *);
 int shb_print(void *, const char *);
 int shb_search(struct device *, void *, void *);
 
-struct cfattach shb_ca = {
+const struct cfattach shb_ca = {
 	sizeof(struct device), shb_match, shb_attach
 };
 
diff --git a/sys/arch/sh/dev/shpcic.c b/sys/arch/sh/dev/shpcic.c
index 7b3ca89a38d..23ea35e1661 100644
--- a/sys/arch/sh/dev/shpcic.c
+++ b/sys/arch/sh/dev/shpcic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shpcic.c,v 1.13 2017/06/22 11:34:51 tom Exp $	*/
+/*	$OpenBSD: shpcic.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: shpcic.c,v 1.10 2005/12/24 20:07:32 perry Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ static const struct shpcic_product {
 int	shpcic_match(struct device *, void *, void *);
 void	shpcic_attach(struct device *, struct device *, void *);
 
-struct cfattach shpcic_ca = {
+const struct cfattach shpcic_ca = {
 	sizeof(struct shpcic_softc), shpcic_match, shpcic_attach
 };
 
diff --git a/sys/arch/sh/sh/cpu.c b/sys/arch/sh/sh/cpu.c
index 680b2cb040f..e814c1b5186 100644
--- a/sys/arch/sh/sh/cpu.c
+++ b/sys/arch/sh/sh/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.5 2020/09/25 14:42:25 deraadt Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.6 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cpu.c,v 1.8 2006/01/02 23:16:20 uwe Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };