From: mpi <mpi@openbsd.org>
Date: Sun, 13 Mar 2022 12:33:01 +0000 (+0000)
Subject: Constify struct cfattach.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=89ed722c33692ad18452b9d394c650f8adc43407;p=openbsd

Constify struct cfattach.

ok miod@
---

diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c
index b8e5e77a514..762897efc77 100644
--- a/sys/arch/macppc/dev/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abtn.c,v 1.17 2015/01/27 09:45:51 dlg Exp $	*/
+/*	$OpenBSD: abtn.c,v 1.18 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: abtn.c,v 1.1 1999/07/12 17:48:26 tsubai Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@ extern int wskbd_set_mixervolume(long, long);
 #endif
 #endif
 
-struct cfattach abtn_ca = {
+const struct cfattach abtn_ca = {
 	sizeof(struct abtn_softc), abtn_match, abtn_attach
 };
 struct cfdriver abtn_cd = {
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 7c78fe099df..b949afe6511 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.44 2021/06/23 14:12:59 cheloha Exp $	*/
+/*	$OpenBSD: adb.c,v 1.45 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -1553,7 +1553,7 @@ adb_restart(void)
 int	adbmatch(struct device *, void *, void *);
 void	adbattach(struct device *, struct device *, void *);
 
-struct cfattach adb_ca = {
+const struct cfattach adb_ca = {
 	sizeof(struct adb_softc), adbmatch, adbattach
 };
 
diff --git a/sys/arch/macppc/dev/aoa.c b/sys/arch/macppc/dev/aoa.c
index 30f2ae57410..dcaf17392f0 100644
--- a/sys/arch/macppc/dev/aoa.c
+++ b/sys/arch/macppc/dev/aoa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aoa.c,v 1.12 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: aoa.c,v 1.13 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005 Tsubai Masanari.  All rights reserved.
@@ -57,7 +57,7 @@ void aoa_attach(struct device *, struct device *, void *);
 void aoa_defer(struct device *);
 void aoa_set_volume(struct aoa_softc *, int, int);
 
-struct cfattach aoa_ca = {
+const struct cfattach aoa_ca = {
 	sizeof(struct aoa_softc), aoa_match, aoa_attach
 };
 
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index a50d2140c79..dbeecc33d41 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.32 2022/02/16 06:41:27 deraadt Exp $	*/
+/*	$OpenBSD: apm.c,v 1.33 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -68,7 +68,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/macppc/dev/asms.c b/sys/arch/macppc/dev/asms.c
index 5f4ad4fae1d..97cdc34f8de 100644
--- a/sys/arch/macppc/dev/asms.c
+++ b/sys/arch/macppc/dev/asms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asms.c,v 1.7 2008/04/25 16:37:44 xsa Exp $	*/
+/*	$OpenBSD: asms.c,v 1.8 2022/03/13 12:33:01 mpi Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  *
@@ -69,7 +69,7 @@ int	asms_match(struct device *, void *, void *);
 void	asms_attach(struct device *, struct device *, void *);
 void	asms_refresh(void *);
 
-struct cfattach asms_ca = {
+const struct cfattach asms_ca = {
 	sizeof(struct asms_softc), asms_match, asms_attach
 };
 
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index c5bcfa9d68e..c0e9cfb408f 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awacs.c,v 1.35 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: awacs.c,v 1.36 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $	*/
 
 /*-
@@ -118,7 +118,7 @@ void awacs_set_speaker_volume(struct awacs_softc *, int, int);
 void awacs_set_ext_volume(struct awacs_softc *, int, int);
 void awacs_set_rate(struct awacs_softc *, struct audio_params *);
 
-struct cfattach awacs_ca = {
+const struct cfattach awacs_ca = {
 	sizeof(struct awacs_softc), awacs_match, awacs_attach
 };
 
diff --git a/sys/arch/macppc/dev/daca.c b/sys/arch/macppc/dev/daca.c
index 4943f7a761a..bc44d162907 100644
--- a/sys/arch/macppc/dev/daca.c
+++ b/sys/arch/macppc/dev/daca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: daca.c,v 1.11 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: daca.c,v 1.12 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2002,2003 Tsubai Masanari.  All rights reserved.
@@ -63,7 +63,7 @@ void daca_defer(struct device *);
 void daca_init(struct daca_softc *);
 void daca_set_volume(struct daca_softc *, int, int);
 
-struct cfattach daca_ca = {
+const struct cfattach daca_ca = {
 	sizeof(struct daca_softc), daca_match, daca_attach
 };
 
diff --git a/sys/arch/macppc/dev/dfs.c b/sys/arch/macppc/dev/dfs.c
index c92725f5bce..63c66cc1947 100644
--- a/sys/arch/macppc/dev/dfs.c
+++ b/sys/arch/macppc/dev/dfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfs.c,v 1.3 2014/07/08 13:06:58 deraadt Exp $	*/
+/*	$OpenBSD: dfs.c,v 1.4 2022/03/13 12:33:01 mpi Exp $	*/
 /*
  * Copyright (c) 2011 Martin Pieuchot <mpi@openbsd.org>
  *
@@ -39,7 +39,7 @@ void	dfs_attach(struct device *, struct device *, void *);
 void	dfs_setperf(int);
 void	dfs_scale_frequency(u_int);
 
-struct cfattach dfs_ca = {
+const struct cfattach dfs_ca = {
 	sizeof(struct dfs_softc), dfs_match, dfs_attach
 };
 
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 40a5b52c59d..426262cc653 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.43 2020/07/10 13:22:19 patrick Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.44 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -123,7 +123,7 @@ void bmac_mii_tick(void *);
 u_int32_t bmac_mbo_read(struct device *);
 void bmac_mbo_write(struct device *, u_int32_t);
 
-struct cfattach bm_ca = {
+const struct cfattach bm_ca = {
 	sizeof(struct bmac_softc), bmac_match, bmac_attach
 };
 
diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 4758eeabe7a..da30b7d2172 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_obio.c,v 1.19 2015/11/24 17:11:38 mpi Exp $	*/
+/*	$OpenBSD: if_wi_obio.c,v 1.20 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -82,7 +82,7 @@ struct wi_obio_softc {
 	u_int keywest;
 };
 
-struct cfattach wi_obio_ca = {
+const struct cfattach wi_obio_ca = {
 	sizeof (struct wi_obio_softc), wi_obio_match, wi_obio_attach,
 	wi_obio_detach, wi_obio_activate
 };
diff --git a/sys/arch/macppc/dev/kiic.c b/sys/arch/macppc/dev/kiic.c
index eb2d4eb4eb3..e3b41db6fdc 100644
--- a/sys/arch/macppc/dev/kiic.c
+++ b/sys/arch/macppc/dev/kiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kiic.c,v 1.4 2013/10/09 17:53:29 mpi Exp $	*/
+/*	$OpenBSD: kiic.c,v 1.5 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: kiic.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -56,10 +56,10 @@ void kiic_i2c_release_bus(void *, int);
 int kiic_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *, size_t,
     void *, size_t, int);
 
-struct cfattach kiic_ca = {
+const struct cfattach kiic_ca = {
 	sizeof(struct kiic_softc), kiic_match, kiic_attach
 };
-struct cfattach kiic_memc_ca = {
+const struct cfattach kiic_memc_ca = {
 	sizeof(struct kiic_softc), kiic_match, kiic_attach
 };
 
diff --git a/sys/arch/macppc/dev/macgpio.c b/sys/arch/macppc/dev/macgpio.c
index a1b192bd78a..a30b4db666c 100644
--- a/sys/arch/macppc/dev/macgpio.c
+++ b/sys/arch/macppc/dev/macgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macgpio.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: macgpio.c,v 1.10 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: gpio.c,v 1.2 2001/02/27 05:16:33 matt Exp $	*/
 
 /*-
@@ -58,11 +58,11 @@ struct gpio_softc {
 	u_int8_t *sc_port;
 };
 
-struct cfattach macgpio_ca = {
+const struct cfattach macgpio_ca = {
 	sizeof(struct gpio_softc), macgpio_match, macgpio_attach
 };
 
-struct cfattach macgpio_gpio_ca = {
+const struct cfattach macgpio_gpio_ca = {
 	sizeof(struct gpio_softc), macgpio_gpio_match, macgpio_gpio_attach
 };
 
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 82bea50cae8..87dae89b856 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.55 2019/09/03 17:51:52 deraadt Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.56 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
@@ -86,7 +86,7 @@ void	mac_ext_intr(void);
 void	macintr_collect_preconf_intr(void);
 void	macintr_setipl(int ipl);
 
-struct cfattach macintr_ca = {
+const struct cfattach macintr_ca = {
 	sizeof(struct macintr_softc),
 	macintr_match,
 	macintr_attach
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c
index 13152fda31d..139f40e589a 100644
--- a/sys/arch/macppc/dev/mediabay.c
+++ b/sys/arch/macppc/dev/mediabay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mediabay.c,v 1.7 2019/10/08 13:21:38 cheloha Exp $	*/
+/*	$OpenBSD: mediabay.c,v 1.8 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: mediabay.c,v 1.9 2003/07/15 02:43:29 lukem Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@ int mediabay_intr(void *);
 void mediabay_create_kthread(void *);
 void mediabay_kthread(void *);
 
-struct cfattach mediabay_ca = {
+const struct cfattach mediabay_ca = {
 	sizeof(struct mediabay_softc), mediabay_match, mediabay_attach
 };
 struct cfdriver mediabay_cd = {
diff --git a/sys/arch/macppc/dev/onyx.c b/sys/arch/macppc/dev/onyx.c
index 62ed93cfc8e..a7b72541b40 100644
--- a/sys/arch/macppc/dev/onyx.c
+++ b/sys/arch/macppc/dev/onyx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: onyx.c,v 1.13 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: onyx.c,v 1.14 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005 Tsubai Masanari.  All rights reserved.
@@ -72,7 +72,7 @@ void onyx_attach(struct device *, struct device *, void *);
 void onyx_defer(struct device *);
 void onyx_set_volume(struct onyx_softc *, int, int);
 
-struct cfattach onyx_ca = {
+const struct cfattach onyx_ca = {
 	sizeof(struct onyx_softc), onyx_match, onyx_attach
 };
 
diff --git a/sys/arch/macppc/dev/pgs.c b/sys/arch/macppc/dev/pgs.c
index 82950d70242..37f2c1f96c4 100644
--- a/sys/arch/macppc/dev/pgs.c
+++ b/sys/arch/macppc/dev/pgs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgs.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: pgs.c,v 1.6 2022/03/13 12:33:01 mpi Exp $	*/
 /*
  * Copyright (c) 2010 Jasper Lievisse Adriaanse <jasper@openbsd.org>
  *
@@ -41,7 +41,7 @@ void	pgs_attach(struct device *, struct device *, void *);
 int	pgs_match(struct device *, void *, void *);
 int	pgs_intr(void *);
 
-struct cfattach pgs_ca = {
+const struct cfattach pgs_ca = {
 	sizeof(struct pgs_softc), pgs_match, pgs_attach
 };
 
diff --git a/sys/arch/macppc/dev/piic.c b/sys/arch/macppc/dev/piic.c
index 461bffd4eb9..fa924e390a9 100644
--- a/sys/arch/macppc/dev/piic.c
+++ b/sys/arch/macppc/dev/piic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piic.c,v 1.3 2011/06/16 10:44:33 mpi Exp $	*/
+/*	$OpenBSD: piic.c,v 1.4 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -39,7 +39,7 @@ struct piic_softc {
 int     piic_match(struct device *, void *, void *);
 void    piic_attach(struct device *, struct device *, void *);
 
-struct cfattach piic_ca = {
+const struct cfattach piic_ca = {
 	sizeof(struct piic_softc), piic_match, piic_attach
 };
 
diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c
index fefaab2cdad..f120acde378 100644
--- a/sys/arch/macppc/dev/smu.c
+++ b/sys/arch/macppc/dev/smu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smu.c,v 1.34 2019/10/08 13:21:38 cheloha Exp $	*/
+/*	$OpenBSD: smu.c,v 1.35 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -103,7 +103,7 @@ struct smu_softc {
 	struct i2c_controller sc_i2c_tag;
 };
 
-struct cfattach smu_ca = {
+const struct cfattach smu_ca = {
         sizeof(struct smu_softc), smu_match, smu_attach
 };
 
diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c
index f21a6d728a9..9ccde482ae5 100644
--- a/sys/arch/macppc/dev/snapper.c
+++ b/sys/arch/macppc/dev/snapper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snapper.c,v 1.40 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: snapper.c,v 1.41 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: snapper.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -70,7 +70,7 @@ void snapper_set_input(struct snapper_softc *, int);
 int tas3004_write(struct snapper_softc *, u_int, const void *);
 int tas3004_init(struct snapper_softc *);
 
-struct cfattach snapper_ca = {
+const struct cfattach snapper_ca = {
 	sizeof(struct snapper_softc), snapper_match, snapper_attach
 };
 struct cfdriver snapper_cd = {
diff --git a/sys/arch/macppc/dev/sysbutton.c b/sys/arch/macppc/dev/sysbutton.c
index f946738424d..1e7b91b1a12 100644
--- a/sys/arch/macppc/dev/sysbutton.c
+++ b/sys/arch/macppc/dev/sysbutton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysbutton.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: sysbutton.c,v 1.7 2022/03/13 12:33:01 mpi Exp $	*/
 /*
  * Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org>
  *
@@ -36,7 +36,7 @@ int sysbutton_match(struct device *, void *, void *);
 void sysbutton_attach(struct device *, struct device *, void *);
 int sysbutton_intr(void *);
 
-struct cfattach sysbutton_ca = {
+const struct cfattach sysbutton_ca = {
 	sizeof(struct sysbutton_softc), sysbutton_match,
 	sysbutton_attach
 };
diff --git a/sys/arch/macppc/dev/tumbler.c b/sys/arch/macppc/dev/tumbler.c
index 504a321a97c..91298692632 100644
--- a/sys/arch/macppc/dev/tumbler.c
+++ b/sys/arch/macppc/dev/tumbler.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tumbler.c,v 1.10 2022/02/16 06:21:18 anton Exp $	*/
+/*	$OpenBSD: tumbler.c,v 1.11 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001,2003 Tsubai Masanari.  All rights reserved.
@@ -68,7 +68,7 @@ void tumbler_set_treble(struct tumbler_softc *, int);
 int tas3001_write(struct tumbler_softc *, u_int, const void *);
 int tas3001_init(struct tumbler_softc *);
 
-struct cfattach tumbler_ca = {
+const struct cfattach tumbler_ca = {
 	sizeof(struct tumbler_softc), tumbler_match, tumbler_attach
 };
 struct cfdriver tumbler_cd = {
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index f95e17344c0..8f4291e64bc 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_obio.c,v 1.30 2013/05/30 16:15:01 deraadt Exp $	*/
+/*	$OpenBSD: wdc_obio.c,v 1.31 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $	*/
 
 /*-
@@ -90,7 +90,7 @@ int	wdc_obio_probe(struct device *, void *, void *);
 void	wdc_obio_attach(struct device *, struct device *, void *);
 int	wdc_obio_detach(struct device *, int);
 
-struct cfattach wdc_obio_ca = {
+const struct cfattach wdc_obio_ca = {
 	sizeof(struct wdc_obio_softc), wdc_obio_probe, wdc_obio_attach,
 	wdc_obio_detach
 };
diff --git a/sys/arch/macppc/dev/xlights.c b/sys/arch/macppc/dev/xlights.c
index 2b009a7925c..13c4efd99c5 100644
--- a/sys/arch/macppc/dev/xlights.c
+++ b/sys/arch/macppc/dev/xlights.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xlights.c,v 1.10 2020/01/10 04:13:31 cheloha Exp $ */
+/* $OpenBSD: xlights.c,v 1.11 2022/03/13 12:33:01 mpi Exp $ */
 /*
  * Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd,org>
  *
@@ -56,7 +56,7 @@ void xlights_deferred(void *);
 void xlights_theosDOT(void *);
 void xlights_timeout(void *);
 
-struct cfattach xlights_ca = {
+const struct cfattach xlights_ca = {
 	sizeof(struct xlights_softc), xlights_match,
 	xlights_attach
 };
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index dab4f4370ec..0f058b06877 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.31 2021/03/11 11:16:58 jsg Exp $	*/
+/*	$OpenBSD: zs.c,v 1.32 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $	*/
 
 /*
@@ -151,7 +151,7 @@ int	zs_print(void *, const char *name);
 int  zs_enable (struct zs_chanstate *);
 void zs_disable (struct zs_chanstate *);
 
-struct cfattach zs_ca = {
+const struct cfattach zs_ca = {
 	sizeof(struct zsc_softc), zs_match, zs_attach
 };
 
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index 24f0af1c753..f40443a0650 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.84 2021/06/14 06:10:44 matthieu Exp $ */
+/*	$OpenBSD: cpu.c,v 1.85 2022/03/13 12:33:01 mpi Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -74,7 +74,7 @@ char machine[] = MACHINE;	/* cpu architecture */
 int	cpumatch(struct device *, void *, void *);
 void	cpuattach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpumatch, cpuattach
 };
 
diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c
index bbd69252403..c9a2930ece3 100644
--- a/sys/arch/macppc/macppc/mainbus.c
+++ b/sys/arch/macppc/macppc/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.26 2020/08/26 03:29:06 visa Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.27 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -40,7 +40,7 @@ static int	mbmatch(struct device *, void *, void *);
 static void	mbattach(struct device *, struct device *, void *);
 static int	mbprint(void *, const char *);
 
-struct cfattach mainbus_ca = {
+const struct cfattach mainbus_ca = {
 	sizeof(struct device), mbmatch, mbattach
 };
 struct cfdriver mainbus_cd = {
diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c
index 4c233eda122..945ee7435d6 100644
--- a/sys/arch/macppc/macppc/mem.c
+++ b/sys/arch/macppc/macppc/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.27 2018/02/19 08:59:52 mpi Exp $	*/
+/*	$OpenBSD: mem.c,v 1.28 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
 
 /*
@@ -93,7 +93,7 @@ struct cfdriver mem_cd = {
 	NULL, "mem", DV_DULL
 };
 
-struct cfattach mem_ca = {
+const struct cfattach mem_ca = {
 	sizeof(struct mem_softc), mem_match, mem_attach
 };
 
diff --git a/sys/arch/macppc/pci/ht.c b/sys/arch/macppc/pci/ht.c
index 9293a5378ed..014173a2ecd 100644
--- a/sys/arch/macppc/pci/ht.c
+++ b/sys/arch/macppc/pci/ht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ht.c,v 1.18 2015/08/30 09:48:39 mpi Exp $	*/
+/*	$OpenBSD: ht.c,v 1.19 2022/03/13 12:33:01 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -50,7 +50,7 @@ struct ht_softc {
 	bus_space_handle_t sc_config0_ioh;
 };
 
-struct cfattach ht_ca = {
+const struct cfattach ht_ca = {
 	sizeof(struct ht_softc), ht_match, ht_attach
 };
 
diff --git a/sys/arch/macppc/pci/kauaiata.c b/sys/arch/macppc/pci/kauaiata.c
index aa6b610d278..70434472e7c 100644
--- a/sys/arch/macppc/pci/kauaiata.c
+++ b/sys/arch/macppc/pci/kauaiata.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kauaiata.c,v 1.10 2008/04/25 14:51:35 jmc Exp $ */
+/*	$OpenBSD: kauaiata.c,v 1.11 2022/03/13 12:33:01 mpi Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn
@@ -57,7 +57,7 @@ void kauaiataattach(struct device *parent, struct device *self, void *aux);
 int kauaiata_print(void *aux, const char *dev);
 
 
-struct cfattach kauaiata_ca = {
+const struct cfattach kauaiata_ca = {
 	sizeof(struct kauaiata_softc), kauaiatamatch, kauaiataattach,
 };
 
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index b03e7ed5e55..85b3753e9b1 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macobio.c,v 1.22 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: macobio.c,v 1.23 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $	*/
 
 /*-
@@ -63,7 +63,7 @@ struct cfdriver macobio_cd = {
 };
 
 
-struct cfattach macobio_ca = {
+const struct cfattach macobio_ca = {
 	sizeof(struct macobio_softc), macobio_match, macobio_attach
 };
 
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 6605ed7e19d..d9d4411d0b7 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.48 2022/02/02 17:11:36 miod Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.49 2022/03/13 12:33:01 mpi Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -69,7 +69,7 @@ struct pcibr_softc {
 	char			sc_memex_name[32];
 };
 
-struct cfattach mpcpcibr_ca = {
+const struct cfattach mpcpcibr_ca = {
         sizeof(struct pcibr_softc), mpcpcibrmatch, mpcpcibrattach,
 };
 
diff --git a/sys/arch/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index 000b5a860c5..b93f93c49b4 100644
--- a/sys/arch/macppc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.15 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: pchb.c,v 1.16 2022/03/13 12:33:01 mpi Exp $	*/
 /*	$NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $	*/
 
 /*-
@@ -48,7 +48,7 @@
 int	pchbmatch(struct device *, void *, void *);
 void	pchbattach(struct device *, struct device *, void *);
 
-struct cfattach pchb_ca = {
+const struct cfattach pchb_ca = {
 	sizeof(struct device), pchbmatch, pchbattach
 };