From 9eaf72d1e5ccbb9efcde4ef7f9cb4287f8996489 Mon Sep 17 00:00:00 2001 From: mpi Date: Sun, 24 Oct 2021 16:57:30 +0000 Subject: [PATCH] Constify struct cfattach. ok visa@ a long time ago, ok krw@ --- sys/scsi/cd.c | 4 ++-- sys/scsi/ch.c | 4 ++-- sys/scsi/mpath.c | 4 ++-- sys/scsi/mpath_emc.c | 4 ++-- sys/scsi/mpath_hds.c | 4 ++-- sys/scsi/mpath_rdac.c | 4 ++-- sys/scsi/mpath_sym.c | 4 ++-- sys/scsi/safte.c | 4 ++-- sys/scsi/scsiconf.c | 4 ++-- sys/scsi/sd.c | 4 ++-- sys/scsi/ses.c | 4 ++-- sys/scsi/st.c | 4 ++-- sys/scsi/uk.c | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 0a4b74bac38..943ad86b196 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.263 2021/03/12 10:22:46 jsg Exp $ */ +/* $OpenBSD: cd.c,v 1.264 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -146,7 +146,7 @@ int dvd_read_struct(struct cd_softc *, union dvd_struct *); int cd_eject(void); #endif /* __macppc__ */ -struct cfattach cd_ca = { +const struct cfattach cd_ca = { sizeof(struct cd_softc), cdmatch, cdattach, cddetach, cdactivate }; diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 7672970b5c8..27b9505aa9d 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.69 2021/08/31 05:29:55 robert Exp $ */ +/* $OpenBSD: ch.c,v 1.70 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -96,7 +96,7 @@ struct ch_softc { int chmatch(struct device *, void *, void *); void chattach(struct device *, struct device *, void *); -struct cfattach ch_ca = { +const struct cfattach ch_ca = { sizeof(struct ch_softc), chmatch, chattach }; diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index 69d937f0cad..d87c826642f 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.54 2020/09/22 19:32:53 krw Exp $ */ +/* $OpenBSD: mpath.c,v 1.55 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2009 David Gwynne @@ -73,7 +73,7 @@ struct mpath_softc { struct mpath_softc *mpath; -struct cfattach mpath_ca = { +const struct cfattach mpath_ca = { sizeof(struct mpath_softc), mpath_match, mpath_attach diff --git a/sys/scsi/mpath_emc.c b/sys/scsi/mpath_emc.c index 6237f5c0024..e6a10b7a720 100644 --- a/sys/scsi/mpath_emc.c +++ b/sys/scsi/mpath_emc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_emc.c,v 1.23 2020/06/30 18:43:37 krw Exp $ */ +/* $OpenBSD: mpath_emc.c,v 1.24 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2011 David Gwynne @@ -70,7 +70,7 @@ void emc_attach(struct device *, struct device *, void *); int emc_detach(struct device *, int); int emc_activate(struct device *, int); -struct cfattach emc_ca = { +const struct cfattach emc_ca = { sizeof(struct emc_softc), emc_match, emc_attach, diff --git a/sys/scsi/mpath_hds.c b/sys/scsi/mpath_hds.c index 6e64c807153..c88693130e3 100644 --- a/sys/scsi/mpath_hds.c +++ b/sys/scsi/mpath_hds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_hds.c,v 1.24 2020/09/05 14:21:52 krw Exp $ */ +/* $OpenBSD: mpath_hds.c,v 1.25 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2011 David Gwynne @@ -71,7 +71,7 @@ void hds_attach(struct device *, struct device *, void *); int hds_detach(struct device *, int); int hds_activate(struct device *, int); -struct cfattach hds_ca = { +const struct cfattach hds_ca = { sizeof(struct hds_softc), hds_match, hds_attach, diff --git a/sys/scsi/mpath_rdac.c b/sys/scsi/mpath_rdac.c index 8c5cc0352a0..7615bf57eb6 100644 --- a/sys/scsi/mpath_rdac.c +++ b/sys/scsi/mpath_rdac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_rdac.c,v 1.25 2020/06/30 18:43:37 krw Exp $ */ +/* $OpenBSD: mpath_rdac.c,v 1.26 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2010 David Gwynne @@ -129,7 +129,7 @@ void rdac_attach(struct device *, struct device *, void *); int rdac_detach(struct device *, int); int rdac_activate(struct device *, int); -struct cfattach rdac_ca = { +const struct cfattach rdac_ca = { sizeof(struct rdac_softc), rdac_match, rdac_attach, diff --git a/sys/scsi/mpath_sym.c b/sys/scsi/mpath_sym.c index 572b583e04a..fbe30a92f5f 100644 --- a/sys/scsi/mpath_sym.c +++ b/sys/scsi/mpath_sym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_sym.c,v 1.26 2021/03/12 10:22:46 jsg Exp $ */ +/* $OpenBSD: mpath_sym.c,v 1.27 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2010 David Gwynne @@ -44,7 +44,7 @@ void sym_attach(struct device *, struct device *, void *); int sym_detach(struct device *, int); int sym_activate(struct device *, int); -struct cfattach sym_ca = { +const struct cfattach sym_ca = { sizeof(struct sym_softc), sym_match, sym_attach, diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c index 05a95bdb061..32831c4f174 100644 --- a/sys/scsi/safte.c +++ b/sys/scsi/safte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safte.c,v 1.66 2020/09/22 19:32:53 krw Exp $ */ +/* $OpenBSD: safte.c,v 1.67 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -85,7 +85,7 @@ struct safte_softc { #endif /* NBIO > 0 */ }; -struct cfattach safte_ca = { +const struct cfattach safte_ca = { sizeof(struct safte_softc), safte_match, safte_attach, safte_detach }; diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index baa4dfdcdd7..92dfba2793f 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.237 2020/11/19 13:45:15 krw Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.238 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -95,7 +95,7 @@ int scsi_activate_lun(struct scsibus_softc *, int, int, int); int scsi_autoconf = SCSI_AUTOCONF; -struct cfattach scsibus_ca = { +const struct cfattach scsibus_ca = { sizeof(struct scsibus_softc), scsibusmatch, scsibusattach, scsibusdetach, scsibusactivate }; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index f9239692c12..bb19ee0cd92 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.329 2020/09/22 19:32:53 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.330 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -110,7 +110,7 @@ int sd_cmd_rw16(struct scsi_generic *, int, u_int64_t, u_int32_t); void sd_buf_done(struct scsi_xfer *); -struct cfattach sd_ca = { +const struct cfattach sd_ca = { sizeof(struct sd_softc), sdmatch, sdattach, sddetach, sdactivate }; diff --git a/sys/scsi/ses.c b/sys/scsi/ses.c index 1aca6ea2ebb..18066e14918 100644 --- a/sys/scsi/ses.c +++ b/sys/scsi/ses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ses.c,v 1.63 2020/09/22 19:32:53 krw Exp $ */ +/* $OpenBSD: ses.c,v 1.64 2021/10/24 16:57:30 mpi Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -87,7 +87,7 @@ struct ses_softc { struct sensor_task *sc_sensortask; }; -struct cfattach ses_ca = { +const struct cfattach ses_ca = { sizeof(struct ses_softc), ses_match, ses_attach, ses_detach }; diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 2f73f79d3a3..104269ef3c9 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.186 2021/03/12 10:22:46 jsg Exp $ */ +/* $OpenBSD: st.c,v 1.187 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -223,7 +223,7 @@ int st_interpret_sense(struct scsi_xfer *); int st_touch_tape(struct st_softc *); int st_erase(struct st_softc *, int, int); -struct cfattach st_ca = { +const struct cfattach st_ca = { sizeof(struct st_softc), stmatch, stattach, stdetach, stactivate }; diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c index 519317dba63..77c1fe42711 100644 --- a/sys/scsi/uk.c +++ b/sys/scsi/uk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uk.c,v 1.25 2020/08/11 15:23:57 krw Exp $ */ +/* $OpenBSD: uk.c,v 1.26 2021/10/24 16:57:30 mpi Exp $ */ /* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */ /* @@ -58,7 +58,7 @@ int ukmatch(struct device *, void *, void *); void ukattach(struct device *, struct device *, void *); int ukdetach(struct device *, int); -struct cfattach uk_ca = { +const struct cfattach uk_ca = { sizeof(struct uk_softc), ukmatch, ukattach, ukdetach }; -- 2.20.1