From 22e452df2392a375fd2998343a374f72c327cac3 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Sun, 13 Mar 2022 13:34:54 +0000
Subject: [PATCH] Constify struct cfattach.

ok miod@
---
 sys/dev/sbus/agten.c          | 4 ++--
 sys/dev/sbus/apio.c           | 6 +++---
 sys/dev/sbus/asio.c           | 6 +++---
 sys/dev/sbus/be.c             | 4 ++--
 sys/dev/sbus/bwtwo.c          | 4 ++--
 sys/dev/sbus/cgsix.c          | 4 ++--
 sys/dev/sbus/cgthree.c        | 4 ++--
 sys/dev/sbus/cgtwelve.c       | 4 ++--
 sys/dev/sbus/cs4231.c         | 4 ++--
 sys/dev/sbus/dma_sbus.c       | 6 +++---
 sys/dev/sbus/esp_sbus.c       | 6 +++---
 sys/dev/sbus/if_gem_sbus.c    | 4 ++--
 sys/dev/sbus/if_hme_sbus.c    | 4 ++--
 sys/dev/sbus/if_le.c          | 4 ++--
 sys/dev/sbus/if_le_lebuffer.c | 4 ++--
 sys/dev/sbus/if_le_ledma.c    | 4 ++--
 sys/dev/sbus/if_ti_sbus.c     | 4 ++--
 sys/dev/sbus/lebuffer.c       | 4 ++--
 sys/dev/sbus/magma.c          | 8 ++++----
 sys/dev/sbus/mgx.c            | 4 ++--
 sys/dev/sbus/qe.c             | 4 ++--
 sys/dev/sbus/qec.c            | 4 ++--
 sys/dev/sbus/qla_sbus.c       | 4 ++--
 sys/dev/sbus/qlw_sbus.c       | 4 ++--
 sys/dev/sbus/rfx.c            | 4 ++--
 sys/dev/sbus/spif.c           | 8 ++++----
 sys/dev/sbus/tvtwo.c          | 4 ++--
 sys/dev/sbus/uperf_sbus.c     | 4 ++--
 sys/dev/sbus/vigra.c          | 4 ++--
 sys/dev/sbus/xbox.c           | 4 ++--
 sys/dev/sbus/zx.c             | 4 ++--
 31 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c
index 4a59e056e5b..03a8fe0c79c 100644
--- a/sys/dev/sbus/agten.c
+++ b/sys/dev/sbus/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.11 2018/12/27 11:09:17 claudio Exp $	*/
+/*	$OpenBSD: agten.c,v 1.12 2022/03/13 13:34:54 mpi Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -122,7 +122,7 @@ struct wsdisplay_accessops agten_accessops = {
 int agtenmatch(struct device *, void *, void *);
 void agtenattach(struct device *, struct device *, void *);
 
-struct cfattach agten_ca = {
+const struct cfattach agten_ca = {
 	sizeof(struct agten_softc), agtenmatch, agtenattach
 };
 
diff --git a/sys/dev/sbus/apio.c b/sys/dev/sbus/apio.c
index 2d7f38f8eab..a81fe949734 100644
--- a/sys/dev/sbus/apio.c
+++ b/sys/dev/sbus/apio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apio.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: apio.c,v 1.9 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -77,7 +77,7 @@ void	apio_attach(struct device *, struct device *, void *);
 int	apio_print(void *, const char *);
 void	apio_intr_enable(struct device *, u_int8_t);
 
-struct cfattach apio_ca = {
+const struct cfattach apio_ca = {
 	sizeof(struct apio_softc), apio_match, apio_attach
 };
 
@@ -174,7 +174,7 @@ struct lpt_apio_softc {
 	void *sc_ih;
 };
 
-struct cfattach lpt_apio_ca = {
+const struct cfattach lpt_apio_ca = {
 	sizeof(struct lpt_apio_softc), lpt_apio_match, lpt_apio_attach
 };
 
diff --git a/sys/dev/sbus/asio.c b/sys/dev/sbus/asio.c
index 1a71346dbb2..b40120bd13b 100644
--- a/sys/dev/sbus/asio.c
+++ b/sys/dev/sbus/asio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asio.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: asio.c,v 1.12 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -84,7 +84,7 @@ void	asio_attach(struct device *, struct device *, void *);
 int	asio_print(void *, const char *);
 void	asio_intr_enable(struct device *, u_int8_t);
 
-struct cfattach asio_ca = {
+const struct cfattach asio_ca = {
 	sizeof(struct asio_softc), asio_match, asio_attach
 };
 
@@ -177,7 +177,7 @@ asio_print(void *aux, const char *name)
 int	com_asio_match(struct device *, void *, void *);
 void	com_asio_attach(struct device *, struct device *, void *);
 
-struct cfattach com_asio_ca = {
+const struct cfattach com_asio_ca = {
 	sizeof(struct com_softc), com_asio_match, com_asio_attach
 };
 
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 0569de5410c..e8ca9d2cf40 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.43 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: be.c,v 1.44 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -177,7 +177,7 @@ void	be_intphy_status(struct be_softc *);
 int	be_intphy_service(struct be_softc *, struct mii_data *, int);
 
 
-struct cfattach be_ca = {
+const struct cfattach be_ca = {
 	sizeof(struct be_softc), bematch, beattach
 };
 
diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c
index dbedf2e3c88..e81f50222b7 100644
--- a/sys/dev/sbus/bwtwo.c
+++ b/sys/dev/sbus/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.19 2013/10/20 20:07:30 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.20 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -117,7 +117,7 @@ struct wsdisplay_accessops bwtwo_accessops = {
 int	bwtwomatch(struct device *, void *, void *);
 void	bwtwoattach(struct device *, struct device *, void *);
 
-struct cfattach bwtwo_ca = {
+const struct cfattach bwtwo_ca = {
 	sizeof (struct bwtwo_softc), bwtwomatch, bwtwoattach
 };
 
diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index 0bbe9e25060..2f5adfefb3c 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.60 2020/05/25 09:55:49 jsg Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.61 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -82,7 +82,7 @@ struct wsdisplay_accessops cgsix_accessops = {
 int	cgsixmatch(struct device *, void *, void *);
 void	cgsixattach(struct device *, struct device *, void *);
 
-struct cfattach cgsix_ca = {
+const struct cfattach cgsix_ca = {
 	sizeof (struct cgsix_softc), cgsixmatch, cgsixattach
 };
 
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index 123ad85a54b..000fa09c4be 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.45 2013/10/20 20:07:30 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.46 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -146,7 +146,7 @@ struct wsdisplay_accessops cgthree_accessops = {
 int	cgthreematch(struct device *, void *, void *);
 void	cgthreeattach(struct device *, struct device *, void *);
 
-struct cfattach cgthree_ca = {
+const struct cfattach cgthree_ca = {
 	sizeof (struct cgthree_softc), cgthreematch, cgthreeattach
 };
 
diff --git a/sys/dev/sbus/cgtwelve.c b/sys/dev/sbus/cgtwelve.c
index 0f042d92655..f8f61c48376 100644
--- a/sys/dev/sbus/cgtwelve.c
+++ b/sys/dev/sbus/cgtwelve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwelve.c,v 1.10 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: cgtwelve.c,v 1.11 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Miodrag Vallat.  All rights reserved.
@@ -106,7 +106,7 @@ int	cgtwelvematch(struct device *, void *, void *);
 void	cgtwelveattach(struct device *, struct device *, void *);
 int	cgtwelveactivate(struct device *, int);
 
-struct cfattach cgtwelve_ca = {
+const struct cfattach cgtwelve_ca = {
 	sizeof(struct cgtwelve_softc), cgtwelvematch, cgtwelveattach,
 	NULL, cgtwelveactivate
 };
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index bb3e8138112..06b090fc736 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4231.c,v 1.39 2022/02/16 06:21:19 anton Exp $	*/
+/*	$OpenBSD: cs4231.c,v 1.40 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -176,7 +176,7 @@ struct audio_hw_if cs4231_sa_hw_if = {
 	cs4231_trigger_input
 };
 
-struct cfattach audiocs_ca = {
+const struct cfattach audiocs_ca = {
 	sizeof (struct cs4231_softc), cs4231_match, cs4231_attach
 };
 
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index 03fa7e2d1a3..6b0369dd658 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma_sbus.c,v 1.17 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: dma_sbus.c,v 1.18 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: dma_sbus.c,v 1.5 2000/07/09 20:57:42 pk Exp $ */
 
 /*-
@@ -97,11 +97,11 @@ void	*dmabus_intr_establish(
 
 static	bus_space_tag_t dma_alloc_bustag(struct dma_softc *sc);
 
-struct cfattach dma_sbus_ca = {
+const struct cfattach dma_sbus_ca = {
 	sizeof(struct dma_softc), dmamatch_sbus, dmaattach_sbus
 };
 
-struct cfattach ledma_ca = {
+const struct cfattach ledma_ca = {
 	sizeof(struct dma_softc), dmamatch_sbus, dmaattach_sbus
 };
 
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index ba597b8a061..790493ea42e 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp_sbus.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: esp_sbus.c,v 1.26 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $	*/
 
 /*-
@@ -75,10 +75,10 @@ int	espmatch_sbus(struct device *, void *, void *);
 
 
 /* Linkup to the rest of the kernel */
-struct cfattach esp_sbus_ca = {
+const struct cfattach esp_sbus_ca = {
 	sizeof(struct esp_softc), espmatch_sbus, espattach_sbus
 };
-struct cfattach esp_dma_ca = {
+const struct cfattach esp_dma_ca = {
 	sizeof(struct esp_softc), espmatch_sbus, espattach_dma
 };
 
diff --git a/sys/dev/sbus/if_gem_sbus.c b/sys/dev/sbus/if_gem_sbus.c
index 820a43d5ce7..abb7ccb0b68 100644
--- a/sys/dev/sbus/if_gem_sbus.c
+++ b/sys/dev/sbus/if_gem_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gem_sbus.c,v 1.10 2015/11/28 09:42:10 jmatthew Exp $	*/
+/*	$OpenBSD: if_gem_sbus.c,v 1.11 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $	*/
 
 /*-
@@ -68,7 +68,7 @@ struct gem_sbus_softc {
 int	gemmatch_sbus(struct device *, void *, void *);
 void	gemattach_sbus(struct device *, struct device *, void *);
 
-struct cfattach gem_sbus_ca = {
+const struct cfattach gem_sbus_ca = {
 	sizeof(struct gem_sbus_softc), gemmatch_sbus, gemattach_sbus
 };
 
diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index 52bbeb635f1..5323d2021a5 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_hme_sbus.c,v 1.16 2015/11/24 17:11:40 mpi Exp $	*/
+/*	$OpenBSD: if_hme_sbus.c,v 1.17 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: if_hme_sbus.c,v 1.6 2001/02/28 14:52:48 mrg Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@ struct hmesbus_softc {
 int	hmematch_sbus(struct device *, void *, void *);
 void	hmeattach_sbus(struct device *, struct device *, void *);
 
-struct cfattach hme_sbus_ca = {
+const struct cfattach hme_sbus_ca = {
 	sizeof(struct hmesbus_softc), hmematch_sbus, hmeattach_sbus
 };
 
diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c
index a6ba3a4b557..e8a94963da4 100644
--- a/sys/dev/sbus/if_le.c
+++ b/sys/dev/sbus/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.17 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_le.c,v 1.18 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: if_le.c,v 1.17 2001/05/30 11:46:35 mrg Exp $	*/
 
 /*-
@@ -85,7 +85,7 @@ static uint64_t lemedia[] = {
 	IFM_ETHER | IFM_10_5
 };
 
-struct cfattach le_sbus_ca = {
+const struct cfattach le_sbus_ca = {
 	sizeof(struct le_softc), lematch_sbus, leattach_sbus
 };
 
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index 5900e3e6d08..397d07e8ca7 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_lebuffer.c,v 1.13 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_le_lebuffer.c,v 1.14 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $	*/
 
 /*-
@@ -83,7 +83,7 @@ static uint64_t lemedia[] = {
 	IFM_ETHER | IFM_10_T
 };
 
-struct cfattach le_lebuffer_ca = {
+const struct cfattach le_lebuffer_ca = {
 	sizeof(struct le_softc), lematch_lebuffer, leattach_lebuffer
 };
 
diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c
index 62d2703eb3e..da233a087fc 100644
--- a/sys/dev/sbus/if_le_ledma.c
+++ b/sys/dev/sbus/if_le_ledma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_ledma.c,v 1.19 2015/09/11 13:02:28 stsp Exp $	*/
+/*	$OpenBSD: if_le_ledma.c,v 1.20 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: if_le_ledma.c,v 1.14 2001/05/30 11:46:35 mrg Exp $	*/
 
 /*-
@@ -97,7 +97,7 @@ void	le_ledma_setaui(struct lance_softc *);
 int	lemediachange(struct lance_softc *);
 void	lemediastatus(struct lance_softc *, struct ifmediareq *);
 
-struct cfattach le_ledma_ca = {
+const struct cfattach le_ledma_ca = {
 	sizeof(struct le_softc), lematch_ledma, leattach_ledma
 };
 
diff --git a/sys/dev/sbus/if_ti_sbus.c b/sys/dev/sbus/if_ti_sbus.c
index aa20a95725c..8e13ad60abf 100644
--- a/sys/dev/sbus/if_ti_sbus.c
+++ b/sys/dev/sbus/if_ti_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti_sbus.c,v 1.4 2015/11/24 17:11:40 mpi Exp $	*/
+/*	$OpenBSD: if_ti_sbus.c,v 1.5 2022/03/13 13:34:54 mpi Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -44,7 +44,7 @@ struct ti_sbus_softc {
 int	ti_sbus_match(struct device *, void *, void *);
 void	ti_sbus_attach(struct device *, struct device *, void *);
 
-struct cfattach ti_sbus_ca = {
+const struct cfattach ti_sbus_ca = {
 	sizeof(struct ti_sbus_softc), ti_sbus_match, ti_sbus_attach
 };
 
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 18bf59ef48b..1112228bd02 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $	*/
+/*	$OpenBSD: lebuffer.c,v 1.11 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
 
 /*-
@@ -48,7 +48,7 @@ int	lebufprint(void *, const char *);
 int	lebufmatch(struct device *, void *, void *);
 void	lebufattach(struct device *, struct device *, void *);
 
-struct cfattach lebuffer_ca = {
+const struct cfattach lebuffer_ca = {
 	sizeof(struct lebuf_softc), lebufmatch, lebufattach
 };
 
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 4a26484f256..bd564d3ea8c 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.33 2021/09/01 16:10:39 jan Exp $	*/
+/*	$OpenBSD: magma.c,v 1.34 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*-
  * Copyright (c) 1998 Iain Hibbert
@@ -157,7 +157,7 @@ static const struct magma_board_info supported_cards[] = {
  *  Autoconfig Stuff
  */
 
-struct cfattach magma_ca = {
+const struct cfattach magma_ca = {
 	sizeof(struct magma_softc), magma_match, magma_attach
 };
 
@@ -165,7 +165,7 @@ struct cfdriver magma_cd = {
 	NULL, "magma", DV_DULL
 };
 
-struct cfattach mtty_ca = {
+const struct cfattach mtty_ca = {
 	sizeof(struct mtty_softc), mtty_match, mtty_attach
 };
 
@@ -173,7 +173,7 @@ struct cfdriver mtty_cd = {
 	NULL, "mtty", DV_TTY
 };
 
-struct cfattach mbpp_ca = {
+const struct cfattach mbpp_ca = {
 	sizeof(struct mbpp_softc), mbpp_match, mbpp_attach
 };
 
diff --git a/sys/dev/sbus/mgx.c b/sys/dev/sbus/mgx.c
index 04995f5ead3..7c336cbd94c 100644
--- a/sys/dev/sbus/mgx.c
+++ b/sys/dev/sbus/mgx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mgx.c,v 1.14 2020/05/25 09:55:49 jsg Exp $	*/
+/*	$OpenBSD: mgx.c,v 1.15 2022/03/13 13:34:54 mpi Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -165,7 +165,7 @@ int	mgx_wait_fifo(struct mgx_softc *, uint);
 int mgxmatch(struct device *, void *, void *);
 void mgxattach(struct device *, struct device *, void *);
 
-struct cfattach mgx_ca = {
+const struct cfattach mgx_ca = {
 	sizeof(struct mgx_softc), mgxmatch, mgxattach
 };
 
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 982fe4207f6..ced25ec3eb6 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.41 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: qe.c,v 1.42 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -148,7 +148,7 @@ struct mbuf	*qe_get(struct qe_softc *, int, int);
 void	qe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 int	qe_ifmedia_upd(struct ifnet *);
 
-struct cfattach qe_ca = {
+const struct cfattach qe_ca = {
 	sizeof(struct qe_softc), qematch, qeattach
 };
 
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index dd445d786cf..74ea02c4bae 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qec.c,v 1.15 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: qec.c,v 1.16 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */
 
 /*-
@@ -67,7 +67,7 @@ void *	qec_intr_establish(
 		void *,			/*arg*/
 		const char *);		/*what*/
 
-struct cfattach qec_ca = {
+const struct cfattach qec_ca = {
 	sizeof(struct qec_softc), qecmatch, qecattach
 };
 
diff --git a/sys/dev/sbus/qla_sbus.c b/sys/dev/sbus/qla_sbus.c
index c36382f5c95..85d9a338596 100644
--- a/sys/dev/sbus/qla_sbus.c
+++ b/sys/dev/sbus/qla_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla_sbus.c,v 1.2 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: qla_sbus.c,v 1.3 2022/03/13 13:34:54 mpi Exp $	*/
 /*
  * Copyright (c) 2014 Mark Kettenis
  *
@@ -41,7 +41,7 @@
 int	qla_sbus_match(struct device *, void *, void *);
 void	qla_sbus_attach(struct device *, struct device *, void *);
 
-struct cfattach qla_sbus_ca = {
+const struct cfattach qla_sbus_ca = {
 	sizeof(struct qla_softc),
 	qla_sbus_match,
 	qla_sbus_attach
diff --git a/sys/dev/sbus/qlw_sbus.c b/sys/dev/sbus/qlw_sbus.c
index c1e6a6a832d..9dc43085d1b 100644
--- a/sys/dev/sbus/qlw_sbus.c
+++ b/sys/dev/sbus/qlw_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw_sbus.c,v 1.1 2014/03/15 21:49:47 kettenis Exp $	*/
+/*	$OpenBSD: qlw_sbus.c,v 1.2 2022/03/13 13:34:54 mpi Exp $	*/
 /*
  * Copyright (c) 2014 Mark Kettenis
  *
@@ -39,7 +39,7 @@
 int	qlw_sbus_match(struct device *, void *, void *);
 void	qlw_sbus_attach(struct device *, struct device *, void *);
 
-struct cfattach qlw_sbus_ca = {
+const struct cfattach qlw_sbus_ca = {
 	sizeof(struct qlw_softc),
 	qlw_sbus_match,
 	qlw_sbus_attach
diff --git a/sys/dev/sbus/rfx.c b/sys/dev/sbus/rfx.c
index c757f72f423..96b504ef1c5 100644
--- a/sys/dev/sbus/rfx.c
+++ b/sys/dev/sbus/rfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfx.c,v 1.13 2022/02/15 10:36:59 jsg Exp $	*/
+/*	$OpenBSD: rfx.c,v 1.14 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -141,7 +141,7 @@ struct wsdisplay_accessops rfx_accessops = {
 int	rfxmatch(struct device *, void *, void *);
 void	rfxattach(struct device *, struct device *, void *);
 
-struct cfattach rfx_ca = {
+const struct cfattach rfx_ca = {
 	sizeof (struct rfx_softc), rfxmatch, rfxattach
 };
 
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index e5236d43c30..ceffc6ef139 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.25 2021/09/01 16:10:39 jan Exp $	*/
+/*	$OpenBSD: spif.c,v 1.26 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -94,7 +94,7 @@ int	sbpppoll(dev_t, int, struct proc *);
 int	sbppkqfilter(dev_t, struct knote *);
 int	sbppioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
-struct cfattach spif_ca = {
+const struct cfattach spif_ca = {
 	sizeof (struct spif_softc), spifmatch, spifattach
 };
 
@@ -102,7 +102,7 @@ struct cfdriver spif_cd = {
 	NULL, "spif", DV_DULL
 };
 
-struct cfattach stty_ca = {
+const struct cfattach stty_ca = {
 	sizeof(struct stty_softc), sttymatch, sttyattach
 };
 
@@ -110,7 +110,7 @@ struct cfdriver stty_cd = {
 	NULL, "stty", DV_TTY
 };
 
-struct cfattach sbpp_ca = {
+const struct cfattach sbpp_ca = {
 	sizeof(struct sbpp_softc), sbppmatch, sbppattach
 };
 
diff --git a/sys/dev/sbus/tvtwo.c b/sys/dev/sbus/tvtwo.c
index 03169471cf4..4ff7dc720c2 100644
--- a/sys/dev/sbus/tvtwo.c
+++ b/sys/dev/sbus/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.16 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.17 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2003, 2006, 2008, Miodrag Vallat.
@@ -144,7 +144,7 @@ void	tvtwo_setcolor(void *, u_int, u_int8_t, u_int8_t, u_int8_t);
 int	tvtwomatch(struct device *, void *, void *);
 void	tvtwoattach(struct device *, struct device *, void *);
 
-struct cfattach tvtwo_ca = {
+const struct cfattach tvtwo_ca = {
 	sizeof(struct tvtwo_softc), tvtwomatch, tvtwoattach
 };
 
diff --git a/sys/dev/sbus/uperf_sbus.c b/sys/dev/sbus/uperf_sbus.c
index d3d3a803e67..ab11ec2be76 100644
--- a/sys/dev/sbus/uperf_sbus.c
+++ b/sys/dev/sbus/uperf_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uperf_sbus.c,v 1.10 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: uperf_sbus.c,v 1.11 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -60,7 +60,7 @@ struct uperf_sbus_softc {
 	bus_space_handle_t	sc_bus_h;	/* direct register handle */
 };
 
-struct cfattach uperf_sbus_ca = {
+const struct cfattach uperf_sbus_ca = {
 	sizeof(struct uperf_sbus_softc), uperf_sbus_match, uperf_sbus_attach
 };
 
diff --git a/sys/dev/sbus/vigra.c b/sys/dev/sbus/vigra.c
index c767cc08667..ae6f7ffd67e 100644
--- a/sys/dev/sbus/vigra.c
+++ b/sys/dev/sbus/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.12 2013/10/20 20:07:31 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.13 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -204,7 +204,7 @@ struct wsdisplay_accessops vigra_accessops = {
 int	vigramatch(struct device *, void *, void *);
 void	vigraattach(struct device *, struct device *, void *);
 
-struct cfattach vigra_ca = {
+const struct cfattach vigra_ca = {
 	sizeof (struct vigra_softc), vigramatch, vigraattach
 };
 
diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c
index 35b52581423..157ab425da4 100644
--- a/sys/dev/sbus/xbox.c
+++ b/sys/dev/sbus/xbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbox.c,v 1.3 2006/06/02 20:00:56 miod Exp $	*/
+/*	$OpenBSD: xbox.c,v 1.4 2022/03/13 13:34:54 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -52,7 +52,7 @@ void	xboxattach(struct device *, struct device *, void *);
 int	xboxprint(void *, const char *);
 int	xbox_fix_range(struct xbox_softc *sc, struct sbus_softc *sbp);
 
-struct cfattach xbox_ca = {
+const struct cfattach xbox_ca = {
 	sizeof (struct xbox_softc), xboxmatch, xboxattach
 };
 
diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c
index 7c7740fa20d..cfefe7ffc6a 100644
--- a/sys/dev/sbus/zx.c
+++ b/sys/dev/sbus/zx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zx.c,v 1.22 2022/01/09 05:42:59 jsg Exp $	*/
+/*	$OpenBSD: zx.c,v 1.23 2022/03/13 13:34:54 mpi Exp $	*/
 /*	$NetBSD: zx.c,v 1.5 2002/10/02 16:52:46 thorpej Exp $	*/
 
 /*
@@ -161,7 +161,7 @@ int	zx_copyrows(void *, int, int, int);
 int	zx_eraserows(void *, int, int, uint32_t);
 int	zx_do_cursor(struct rasops_info *);
 
-struct cfattach zx_ca = {
+const struct cfattach zx_ca = {
 	sizeof(struct zx_softc), zx_match, zx_attach
 };
 
-- 
2.20.1