constify struct cfattach

21 files changed, 42 insertions, 42 deletions

diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index b63830635e9..98a2840fd94 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus.c,v 1.52 2019/11/30 18:19:51 cheloha Exp $	*/
+/*	$OpenBSD: cardbus.c,v 1.53 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ STATIC void enable_function(struct cardbus_softc *, int, int);
 STATIC void disable_function(struct cardbus_softc *, int);
 
 
-struct cfattach cardbus_ca = {
+const struct cfattach cardbus_ca = {
 	sizeof(struct cardbus_softc), cardbusmatch, cardbusattach
 };
 
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index a90ca275e86..09bb1d0aef9 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardslot.c,v 1.22 2020/02/18 12:13:39 mpi Exp $	*/
+/*	$OpenBSD: cardslot.c,v 1.23 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ STATIC int cardslot_cb_print(void *aux, const char *pcic);
 STATIC int cardslot_16_print(void *, const char *);
 STATIC int cardslot_16_submatch(struct device *, void *,void *);
 
-struct cfattach cardslot_ca = {
+const struct cfattach cardslot_ca = {
 	sizeof(struct cardslot_softc), cardslotmatch, cardslotattach
 };
 
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index e520d98099e..c286a3c7940 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.43 2015/11/14 14:47:56 miod Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.44 2022/04/06 18:59:27 naddy Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -93,7 +93,7 @@ struct csdev *com_cardbus_find_csdev(struct cardbus_attach_args *);
 int	com_cardbus_gofigure(struct cardbus_attach_args *,
     struct com_cardbus_softc *);
 
-struct cfattach com_cardbus_ca = {
+const struct cfattach com_cardbus_ca = {
 	sizeof(struct com_cardbus_softc), com_cardbus_match,
 	com_cardbus_attach, com_cardbus_detach, com_activate
 };
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index a6778539ea9..59332abd79c 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_cardbus.c,v 1.22 2015/11/11 02:29:14 jsg Exp $ */
+/*	$OpenBSD: ehci_cardbus.c,v 1.23 2022/04/06 18:59:27 naddy Exp $ */
 /*	$NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct ehci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach ehci_cardbus_ca = {
+const struct cfattach ehci_cardbus_ca = {
 	sizeof(struct ehci_cardbus_softc), ehci_cardbus_match,
 	ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate
 };
diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c
index 36ed0358614..7c53a8c49ac 100644
--- a/sys/dev/cardbus/if_acx_cardbus.c
+++ b/sys/dev/cardbus/if_acx_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_acx_cardbus.c,v 1.22 2015/11/24 17:11:39 mpi Exp $  */
+/*	$OpenBSD: if_acx_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -82,7 +82,7 @@ int	acx_cardbus_match(struct device *, void *, void *);
 void	acx_cardbus_attach(struct device *, struct device *, void *);
 int	acx_cardbus_detach(struct device *, int);
 
-struct cfattach acx_cardbus_ca = {
+const struct cfattach acx_cardbus_ca = {
 	sizeof (struct acx_cardbus_softc), acx_cardbus_match,
 	acx_cardbus_attach, acx_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index b7ce6546bba..30985c28ddd 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_cardbus.c,v 1.19 2015/11/24 17:11:39 mpi Exp $   */
+/*      $OpenBSD: if_ath_cardbus.c,v 1.20 2022/04/06 18:59:28 naddy Exp $   */
 /*	$NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
 
 /*
@@ -95,7 +95,7 @@ int	ath_cardbus_match(struct device *, void *, void *);
 void	ath_cardbus_attach(struct device *, struct device *, void *);
 int	ath_cardbus_detach(struct device *, int);
 
-struct cfattach ath_cardbus_ca = {
+const struct cfattach ath_cardbus_ca = {
 	sizeof(struct ath_cardbus_softc),
 	ath_cardbus_match,
 	ath_cardbus_attach,
diff --git a/sys/dev/cardbus/if_athn_cardbus.c b/sys/dev/cardbus/if_athn_cardbus.c
index 91e2d16d61a..2082fea0b0d 100644
--- a/sys/dev/cardbus/if_athn_cardbus.c
+++ b/sys/dev/cardbus/if_athn_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_cardbus.c,v 1.16 2021/04/15 18:25:43 stsp Exp $	*/
+/*	$OpenBSD: if_athn_cardbus.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -81,7 +81,7 @@ uint32_t	athn_cardbus_read(struct athn_softc *, uint32_t);
 void		athn_cardbus_write(struct athn_softc *, uint32_t, uint32_t);
 void		athn_cardbus_write_barrier(struct athn_softc *);
 
-struct cfattach athn_cardbus_ca = {
+const struct cfattach athn_cardbus_ca = {
 	sizeof (struct athn_cardbus_softc),
 	athn_cardbus_match,
 	athn_cardbus_attach,
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 914c07ddd1b..1c3245a652e 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.24 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.25 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -104,7 +104,7 @@ int	atw_cardbus_match(struct device *, void *, void *);
 void	atw_cardbus_attach(struct device *, struct device *, void *);
 int	atw_cardbus_detach(struct device *, int);
 
-struct cfattach atw_cardbus_ca = {
+const struct cfattach atw_cardbus_ca = {
 	sizeof(struct atw_cardbus_softc), atw_cardbus_match, atw_cardbus_attach,
 	    atw_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_bwi_cardbus.c b/sys/dev/cardbus/if_bwi_cardbus.c
index f69e1440bd7..9e2e8970382 100644
--- a/sys/dev/cardbus/if_bwi_cardbus.c
+++ b/sys/dev/cardbus/if_bwi_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bwi_cardbus.c,v 1.15 2013/12/06 21:03:02 deraadt Exp $ */
+/*	$OpenBSD: if_bwi_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -70,7 +70,7 @@ void		bwi_cardbus_disable(struct bwi_softc *);
 void		bwi_cardbus_conf_write(void *, uint32_t, uint32_t);
 uint32_t	bwi_cardbus_conf_read(void *, uint32_t);
 
-struct cfattach bwi_cardbus_ca = {
+const struct cfattach bwi_cardbus_ca = {
 	sizeof (struct bwi_cardbus_softc), bwi_cardbus_match,
 	bwi_cardbus_attach, bwi_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index 3cb7a65d181..fd11bdd160d 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_cardbus.c,v 1.40 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_dc_cardbus.c,v 1.41 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -87,7 +87,7 @@ int dc_cardbus_detach(struct device *, int);
 
 void dc_cardbus_setup(struct dc_cardbus_softc *csc);
 
-struct cfattach dc_cardbus_ca = {
+const struct cfattach dc_cardbus_ca = {
 	sizeof(struct dc_cardbus_softc), dc_cardbus_match, dc_cardbus_attach,
 	dc_cardbus_detach, dc_activate
 };
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 9a9d6153f54..b6221922a36 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.37 2020/01/05 01:07:58 jsg Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.38 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -87,7 +87,7 @@ struct fxp_cardbus_softc {
 	pci_chipset_tag_t pc;
 };
 
-struct cfattach fxp_cardbus_ca = {
+const struct cfattach fxp_cardbus_ca = {
 	sizeof(struct fxp_cardbus_softc), fxp_cardbus_match, fxp_cardbus_attach,
 	    fxp_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_malo_cardbus.c b/sys/dev/cardbus/if_malo_cardbus.c
index a91ae86bafc..471fe30813a 100644
--- a/sys/dev/cardbus/if_malo_cardbus.c
+++ b/sys/dev/cardbus/if_malo_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_malo_cardbus.c,v 1.12 2013/12/06 21:03:02 deraadt Exp $ */
+/*	$OpenBSD: if_malo_cardbus.c,v 1.13 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -65,7 +65,7 @@ void	malo_cardbus_setup(struct malo_cardbus_softc *csc);
 int	malo_cardbus_enable(struct malo_softc *sc);
 void	malo_cardbus_disable(struct malo_softc *sc);
 
-struct cfattach malo_cardbus_ca = {
+const struct cfattach malo_cardbus_ca = {
 	sizeof (struct malo_cardbus_softc), malo_cardbus_match,
 	malo_cardbus_attach, malo_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_pgt_cardbus.c b/sys/dev/cardbus/if_pgt_cardbus.c
index 5c8d4ca0885..1c60cb4602d 100644
--- a/sys/dev/cardbus/if_pgt_cardbus.c
+++ b/sys/dev/cardbus/if_pgt_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pgt_cardbus.c,v 1.18 2015/12/11 16:07:01 mpi Exp $ */
+/*	$OpenBSD: if_pgt_cardbus.c,v 1.19 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
@@ -72,7 +72,7 @@ void	pgt_cardbus_disable(struct pgt_softc *);
 void	pgt_cardbus_power(struct pgt_softc *, int);
 void	pgt_cardbus_setup(struct pgt_cardbus_softc *);
 
-struct cfattach pgt_cardbus_ca = {
+const struct cfattach pgt_cardbus_ca = {
 	sizeof(struct pgt_cardbus_softc), pgt_cardbus_match, pgt_cardbus_attach,
 	pgt_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index d1812d8b09c..4e3ba383d4b 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral_cardbus.c,v 1.22 2015/11/24 17:11:39 mpi Exp $  */
+/*	$OpenBSD: if_ral_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $  */
 
 /*-
  * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -108,7 +108,7 @@ void	ral_cardbus_attach(struct device *, struct device *, void *);
 int	ral_cardbus_detach(struct device *, int);
 int	ral_cardbus_activate(struct device *, int);
 
-struct cfattach ral_cardbus_ca = {
+const struct cfattach ral_cardbus_ca = {
 	sizeof (struct ral_cardbus_softc), ral_cardbus_match,
 	ral_cardbus_attach, ral_cardbus_detach,
 	ral_cardbus_activate
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index 0d744d64cb7..0d01d700793 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_cardbus.c,v 1.29 2020/06/17 10:48:44 claudio Exp $	*/
+/*	$OpenBSD: if_re_cardbus.c,v 1.30 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -71,7 +71,7 @@ void	re_cardbus_setup(struct rl_softc *);
 /*
  * Cardbus autoconfig definitions
  */
-struct cfattach re_cardbus_ca = {
+const struct cfattach re_cardbus_ca = {
 	sizeof(struct re_cardbus_softc),
 	re_cardbus_probe,
 	re_cardbus_attach,
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index b593a88693d..2d4eb393a67 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.31 2020/06/17 10:48:44 claudio Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.32 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -118,7 +118,7 @@ static void rl_cardbus_attach(struct device *, struct device *, void *);
 static int rl_cardbus_detach(struct device *, int);
 void rl_cardbus_setup(struct rl_cardbus_softc *);
 
-struct cfattach rl_cardbus_ca = {
+const struct cfattach rl_cardbus_ca = {
 	sizeof(struct rl_cardbus_softc), rl_cardbus_match, rl_cardbus_attach,
 	    rl_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 6f4546becba..5bbb126fa9a 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.26 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.27 2022/04/06 18:59:28 naddy Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -136,7 +136,7 @@ int rtw_cardbus_detach(struct device *, int);
 void rtw_cardbus_intr_ack(struct rtw_regs *);
 void rtw_cardbus_funcregen(struct rtw_regs *, int);
 
-struct cfattach rtw_cardbus_ca = {
+const struct cfattach rtw_cardbus_ca = {
     sizeof(struct rtw_cardbus_softc), rtw_cardbus_match, rtw_cardbus_attach,
     	rtw_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 6c6b8315385..06b6256cffd 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_cardbus.c,v 1.33 2015/11/24 17:11:39 mpi Exp $ */
+/*	$OpenBSD: if_xl_cardbus.c,v 1.34 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $	*/
 
 /*
@@ -94,7 +94,7 @@ struct xl_cardbus_softc {
 	bus_size_t sc_mapsize;		/* size of mapped bus space region */
 };
 
-struct cfattach xl_cardbus_ca = {
+const struct cfattach xl_cardbus_ca = {
 	sizeof(struct xl_cardbus_softc), xl_cardbus_match,
 	    xl_cardbus_attach, xl_cardbus_detach
 };
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index c099342bccc..633195aa457 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_cardbus.c,v 1.22 2019/01/07 03:41:06 dlg Exp $ */
+/*	$OpenBSD: ohci_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct ohci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach ohci_cardbus_ca = {
+const struct cfattach ohci_cardbus_ca = {
 	sizeof(struct ohci_cardbus_softc), ohci_cardbus_match,
 	    ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate
 };
diff --git a/sys/dev/cardbus/puc_cardbus.c b/sys/dev/cardbus/puc_cardbus.c
index c900ae7ee8f..e93149efb41 100644
--- a/sys/dev/cardbus/puc_cardbus.c
+++ b/sys/dev/cardbus/puc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: puc_cardbus.c,v 1.8 2011/11/15 22:27:53 deraadt Exp $	*/
+/*	$OpenBSD: puc_cardbus.c,v 1.9 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -47,7 +47,7 @@ const char *puc_cardbus_intr_string(struct puc_attach_args *);
 void *puc_cardbus_intr_establish(struct puc_attach_args *, int,
     int (*)(void *), void *, char *);
 
-struct cfattach puc_cardbus_ca = {
+const struct cfattach puc_cardbus_ca = {
 	sizeof(struct puc_cardbus_softc), puc_cardbus_match,
 	puc_cardbus_attach, puc_cardbus_detach
 };
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index f8aecdb9dc8..d6aa0a8f27e 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci_cardbus.c,v 1.15 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: uhci_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ struct uhci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach uhci_cardbus_ca = {
+const struct cfattach uhci_cardbus_ca = {
 	sizeof(struct uhci_cardbus_softc), uhci_cardbus_match,
 	    uhci_cardbus_attach, uhci_cardbus_detach, uhci_activate
 };