 @@ -1,14 +1,14 @@
-/*	$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,27 +54,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fd.c	7.4 (Berkeley) 5/25/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.124.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 @@ -504,27 +504,27 @@ fdcattach(device_t parent, device_t self
 	/* reset */
 	intio_disable_intr(SICILIAN_INTR_FDD);
 	intio_enable_intr(SICILIAN_INTR_FDC);
 	fdcresult(fdc);
 	fdcreset(fdc);
 	aprint_normal_dev(self, "uPD72065 FDC\n");
 	out_fdc(iot, ioh, NE7CMD_SPECIFY);	/* specify command */
 	out_fdc(iot, ioh, 0xd0);
 	out_fdc(iot, ioh, 0x10);
 	/* physical limit: four drives per controller. */
 	for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
-		(void)config_found(self, (void *)&fa, fdprint, CFARG_EOL);
+		(void)config_found(self, (void *)&fa, fdprint, CFARGS_NONE);
+	}
 	intio_enable_intr(SICILIAN_INTR_FDC);
+}
 void
 fdcreset(struct fdc_softc *fdc)
+{
 	bus_space_write_1(fdc->sc_iot, fdc->sc_ioh, fdsts, NE7CMD_RESET);
+}
 static int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*
  * Copyright (c) 1991 University of Utah.
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -34,27 +34,27 @@
  * SUCH DAMAGE.
+ *
  * from: Utah $Hdr: grf_machdep.c 1.1 92/01/21
+ *
  *	@(#)grf_machdep.c	8.2 (Berkeley) 1/12/94
  */
 /*
  * Graphics display driver for the HP300/400 DIO/DIO-II based machines.
  * This is the hardware-dependent configuration portion of the driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.33.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "locators.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/grfioctl.h>
 #include <x68k/dev/grfvar.h>
 #include <x68k/x68k/iodevice.h>
 /* grfbus: is this necessary? */
 @@ -83,35 +83,34 @@ grfbusmatch(device_t parent, cfdata_t cf
+{
 	if (strcmp(aux, grfbus_cd.cd_name))
 		return (0);
 	return (1);
+}
 void
 grfbusattach(device_t parent, device_t self, void *aux)
+{
 	aprint_normal("\n");
 	config_search(self, NULL,
-	    CFARG_SEARCH, grfbussearch,
+	    CFARGS(.search = grfbussearch));
 	    CFARG_EOL);
+}
 int
 grfbussearch(device_t self, cfdata_t match, const int *ldesc, void *aux)
+{
-	config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARG_EOL);
+	config_found(self, &match->cf_loc[GRFBCF_ADDR], grfbusprint, CFARGS_NONE);
 	return (0);
+}
 int
 grfbusprint(void *aux, const char *name)
+{
 	if (name == NULL)
 		return (UNCONF);
 	return (QUIET);
+}
 /*
 @@ -147,27 +146,27 @@ grfattach(device_t parent, device_t self
 	grfinit(gp, addr);
 	aprint_normal(": %d x %d ",
 		gp->g_display.gd_dwidth, gp->g_display.gd_dheight);
 	if (gp->g_display.gd_colors == 2)
 		aprint_normal("monochrome");
 	else
 		aprint_normal("%d colors", gp->g_display.gd_colors);
 	aprint_normal(" %s display\n", gp->g_sw->gd_desc);
 	/*
 	 * try and attach an ite
 	 */
-	config_found(self, gp, grfprint, CFARG_EOL);
+	config_found(self, gp, grfprint, CFARGS_NONE);
+}
 int
 grfprint(void *aux, const char *pnp)
+{
 	if (pnp)
 		aprint_normal("ite at %s", pnp);
 	return UNCONF;
+}
 int
 grfinit(struct grf_softc *gp, int cfaddr)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intio.c,v 1.48 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: intio.c,v 1.48.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * NetBSD/x68k internal I/O virtual bus.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.48 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.48.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 @@ -166,46 +166,45 @@ intio_attach(device_t parent, device_t s
 	intio_alloc_system_ports(sc);
 	sc->sc_bst = &intio_bus;
 	sc->sc_bst->x68k_bus_device = self;
 	sc->sc_dmat = &intio_bus_dma;
 	sc->sc_dmac = 0;
 	memset(iiv, 0, sizeof(struct intio_interrupt_vector) * 256);
 	ia.ia_bst = sc->sc_bst;
 	ia.ia_dmat = sc->sc_dmat;
 	config_search(self, &ia,
-	    CFARG_SEARCH, intio_search,
+	    CFARGS(.search = intio_search));
 	    CFARG_EOL);
+}
 static int
 intio_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct intio_softc *sc = device_private(parent);
 	struct intio_attach_args *ia = aux;
 	ia->ia_bst = sc->sc_bst;
 	ia->ia_dmat = sc->sc_dmat;
 	ia->ia_name = cf->cf_name;
 	ia->ia_addr = cf->cf_addr;
 	ia->ia_intr = cf->cf_intr;
 	ia->ia_dma = cf->cf_dma;
 	ia->ia_dmaintr = cf->cf_dmaintr;
 	if (config_probe(parent, cf, ia))
-		config_attach(parent, cf, ia, intio_print, CFARG_EOL);
+		config_attach(parent, cf, ia, intio_print, CFARGS_NONE);
 	return (0);
+}
 static int
 intio_print(void *aux, const char *name)
+{
 	struct intio_attach_args *ia = aux;
 /*	if (ia->ia_addr > 0)	*/
 		aprint_normal(" addr 0x%06x", ia->ia_addr);
 	if (ia->ia_intr > 0)
 		aprint_normal(" intr 0x%02x", ia->ia_intr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mfp.c,v 1.28 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: mfp.c,v 1.28.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,27 +26,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * MC68901 MFP (multi function periferal) driver for NetBSD/x68k
  */
 /*
  * MFP is used as keyboard controller, which may be used before
  * ordinary initialization.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.28 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.28.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/dev/mfp.h>
 @@ -98,36 +98,35 @@ mfp_attach(device_t parent, device_t sel
 	mfp_attached = 1;
 	/* mfp_init() is already called via early config_console() */
 	sc->sc_bst = ia->ia_bst;
 	sc->sc_intr = ia->ia_intr;
 	ia->ia_size = 0x30;
 	r = intio_map_allocate_region(parent, ia, INTIO_MAP_ALLOCATE);
 #ifdef DIAGNOSTIC
 	if (r)
 		panic("IO map for MFP corruption??");
 #endif
 	bus_space_map(ia->ia_bst, ia->ia_addr, 0x2000, 0, &sc->sc_bht);
 	config_search(self, NULL,
-	    CFARG_SEARCH, mfp_search,
+	    CFARGS(.search = mfp_search));
 	    CFARG_EOL);
+}
 static int
 mfp_search(device_t parent, cfdata_t cf, const int *loc, void *aux)
+{
 	if (config_probe(parent, cf, __UNCONST(cf->cf_name)))
 		config_attach(parent, cf, __UNCONST(cf->cf_name), NULL,
-		    CFARG_EOL);
+		    CFARGS_NONE);
 	return 0;
+}
 void
 mfp_config_console(void)
+{
 	mfp_init();
 	mfp_calibrate_delay();
+}
 static void
 mfp_init(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mha.c,v 1.55 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: mha.c,v 1.55.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, Masaru Oki, Takumi Nakamura, Masanobu Saitoh and
  * Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -49,27 +49,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.55 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.55.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "opt_ddb.h"
 /* Synchronous data transfers? */
 #define SPC_USE_SYNCHRONOUS	0
 #define SPC_SYNC_REQ_ACK_OFS 	8
 /* Default DMA mode? */
 #define MHA_DMA_LIMIT_XFER	1
 #define MHA_DMA_BURST_XFER	1
 #define MHA_DMA_SHORT_BUS_CYCLE	1
 #define MHA_DMA_DATAIN	(0 | (MHA_DMA_LIMIT_XFER << 1)		\
 @@ -377,27 +377,27 @@ mhaattach(device_t parent, device_t self
 	while (SSR & SS_IREQUEST) {
 		(void) ISCSR;
+	}
 	CMR = CMD_SET_UP_REG;	/* setup reg cmd. */
 	SPC_TRACE(("waiting for intr..."));
 	while (!(SSR & SS_IREQUEST))
 		delay(10);
 	mhaintr(sc);
 	tmpsc = NULL;
-	config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+	config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
+}
 #if 0
 void
 mha_reset(struct mha_softc *sc)
+{
 	u_short	dummy;
 printf("reset...");
 	CMR = CMD_SOFT_RESET;
 	__asm volatile ("nop");	/* XXX wait (4clk in 20 MHz) ??? */
 	dummy = sc->sc_ps[-1];
 	dummy = sc->sc_ps[-1];
 	dummy = sc->sc_ps[-1];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: neptune.c,v 1.22 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: neptune.c,v 1.22.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Neptune-X -- X68k-ISA Bus Bridge
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.22 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.22.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/dev/neptunevar.h>
 @@ -108,31 +108,30 @@ neptune_attach(device_t parent, device_t
 		panic("IO map for Neptune corruption??");
 #endif
 	sc->sc_bst = malloc(sizeof(struct x68k_bus_space), M_DEVBUF, M_WAITOK);
 	*sc->sc_bst = neptune_bus;
 	sc->sc_bst->x68k_bus_device = self;
 	sc->sc_addr = (vaddr_t)IIOV(ia->ia_addr);
 	na.na_bst = sc->sc_bst;
 	na.na_intr = ia->ia_intr;
 	cf = config_search(self, &na,
-	    CFARG_SUBMATCH, neptune_search,
+	    CFARGS(.submatch = neptune_search));
 	    CFARG_EOL);
 	if (cf) {
 		aprint_normal(": Neptune-X ISA bridge\n");
-		config_attach(self, cf, &na, neptune_print, CFARG_EOL);
+		config_attach(self, cf, &na, neptune_print, CFARGS_NONE);
 	} else {
 		aprint_normal(": no device found.\n");
 		intio_map_free_region(parent, ia);
+	}
+}
 static int
 neptune_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct neptune_attach_args *na = aux;
 	na->na_addr = cf->neptune_cf_addr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsirom.c,v 1.21 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: scsirom.c,v 1.21.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * SCSI BIOS ROM.
  * Used to probe the board.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.21 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.21.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/dev/scsiromvar.h>
 struct {
 	paddr_t addr, devaddr;
 @@ -147,22 +147,22 @@ scsirom_attach(device_t parent, device_t
 		panic("IO map for SCSIROM corruption??");
 #endif
 	ia->ia_addr = scsirom_descr[sc->sc_which].devaddr;
 	if (ia->ia_intr == INTIOCF_INTR_DEFAULT)
 		ia->ia_intr = scsirom_descr[sc->sc_which].intr;
 	if (sc->sc_which == INTERNAL)
 		aprint_normal(": On-board at %p\n", (void *)ia->ia_addr);
 	else
 		aprint_normal(": External at %p\n", (void *)ia->ia_addr);
 	cf = config_search(self, ia,
-	    CFARG_EOL);
+	    CFARGS_NONE);
 	if (cf) {
-		config_attach(self, cf, ia, NULL, CFARG_EOL);
+		config_attach(self, cf, ia, NULL, CFARGS_NONE);
 	} else {
 		aprint_normal_dev(self, "no matching device; ignored.\n");
+	}
 	return;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.45.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998 Minoura Makoto
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -30,27 +30,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Zilog Z8530 Dual UART driver (machine-dependent part)
+ *
  * X68k uses one Z8530 built-in. Channel A is for RS-232C serial port;
  * while channel B is dedicated to the mouse.
  * Extra Z8530's can be installed for serial ports.  This driver
  * supports up to 5 chips including the built-in one.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
 #include <sys/syslog.h>
 #include <sys/cpu.h>
 @@ -241,27 +241,27 @@ zs_attach(device_t parent, device_t self
 		 * so just do it on the A channel.
 		 */
 		if (channel == 0) {
 			s = splzs();
 			zs_write_reg(cs, 9, 0);
 			splx(s);
+		}
 		/*
 		 * Look for a child driver for this channel.
 		 * The child attach will setup the hardware.
 		 */
 		child = config_found(self, (void *)&zsc_args, zs_print,
-		    CFARG_EOL);
+		    CFARGS_NONE);
 #if ZSTTY > 0
 		if (zc == conschan &&
 		    ((child && strcmp(device_xname(child), "zstty0")) ||
 		     child == NULL)) /* XXX */
 			panic("%s: console device mismatch", __func__);
 #endif
 		if (child == NULL) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 				ZSWR9_A_RESET : ZSWR9_B_RESET;
 			s = splzs();
 			zs_write_reg(cs,  9, reset);
 			splx(s);

 @@ -1,14 +1,14 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*
  * Copyright (c) 2008 Tetsuya Isaki. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * mainbus driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 static int  mainbus_match(device_t, cfdata_t, void *);
 static void mainbus_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(mainbus, 0,
 	mainbus_match, mainbus_attach, NULL, NULL);
 static int mainbus_attached;
 @@ -55,16 +55,16 @@ mainbus_match(device_t parent, cfdata_t
+}
 /*
  * "find" all the things that should be there.
  */
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	mainbus_attached = 1;
 	aprint_normal("\n");
-	config_found(self, __UNCONST("intio")  , NULL, CFARG_EOL);
+	config_found(self, __UNCONST("intio")  , NULL, CFARGS_NONE);
-	config_found(self, __UNCONST("grfbus") , NULL, CFARG_EOL);
+	config_found(self, __UNCONST("grfbus") , NULL, CFARGS_NONE);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: amdnb_misc.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/*	$NetBSD: amdnb_misc.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christoph Egger.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 static int amdnb_misc_match(device_t, cfdata_t match, void *);
 static void amdnb_misc_attach(device_t, device_t, void *);
 static int amdnb_misc_detach(device_t, int);
 static int amdnb_misc_rescan(device_t, const char *, const int *);
 static void amdnb_misc_childdet(device_t, device_t);
 @@ -104,69 +104,67 @@ amdnb_misc_search(device_t parent, cfdat
+	{
 		if (device_parent(dev) != parent)
 			continue;
 		if (device_is_a(dev, cf->cf_name)) {
 			attach = false;
 			break;
+		}
+	}
 	deviter_release(&di);
 	if (!attach)
 		return 0;
-	config_attach(parent, cf, aux, NULL, CFARG_EOL);
+	config_attach(parent, cf, aux, NULL, CFARGS_NONE);
 	return 0;
+}
 static void
 amdnb_misc_attach(device_t parent, device_t self, void *aux)
+{
 	struct amdnb_misc_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	sc->sc_pa = *pa;
 	aprint_naive("\n");
 	aprint_normal(": AMD NB Misc Configuration\n");
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	config_search(self, &sc->sc_pa,
-	    CFARG_SEARCH, amdnb_misc_search,
+	    CFARGS(.search = amdnb_misc_search));
 	    CFARG_EOL);
 	return;
+}
 static int
 amdnb_misc_detach(device_t self, int flags)
+{
 	int rv;
 	rv = config_detach_children(self, flags);
 	if (rv != 0)
 		return rv;
 	pmf_device_deregister(self);
 	return rv;
+}
 static int
 amdnb_misc_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct amdnb_misc_softc *sc = device_private(self);
 	config_search(self, &sc->sc_pa,
-	    CFARG_SEARCH, amdnb_misc_search,
+	    CFARGS(.search = amdnb_misc_search));
 	    CFARG_EOL);
 	return 0;
+}
 static void
 amdnb_misc_childdet(device_t self, device_t child)
+{
 	return;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: amdpcib.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: amdpcib.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*
  * Copyright (c) 2006 Nicolas Joly
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpcib.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpcib.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include "pcibvar.h"
 struct amdpcib_softc {
 	/* we are calling pcibattach(), which assumes this starts like this: */
 	struct pcib_softc	sc_pcib;
 	bus_space_tag_t		sc_memt;
 @@ -63,29 +63,27 @@ amdpcib_match(device_t parent, cfdata_t
 		return 2;
 	return 0;
+}
 static void
 amdpcib_attach(device_t parent, device_t self, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	pcibattach(parent, self, aux);
 	config_search(self, pa,
-	    CFARG_SEARCH, amdpcib_search,
+	    CFARGS(.search = amdpcib_search,
-	    CFARG_IATTR, "amdpcib",
+		   .iattr = "amdpcib"));
 	    CFARG_EOL);
+}
 static int
 amdpcib_search(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
 	if (config_probe(parent, cf, aux))
 		config_attach(parent, cf, aux, NULL,
-		    CFARG_LOCATORS, locs,
+		    CFARGS(.locators = locs));
 		    CFARG_EOL);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: amdsmn.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: amdsmn.c,v 1.11.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 2017, 2019 Conrad Meyer <cem@FreeBSD.org>
  * All rights reserved.
+ *
  * NetBSD port by Ian Clark <mrrooster@gmail.com>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.11 2021/04/24 23:36:51 thorpej Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.11.8.1 2021/08/04 03:03:30 thorpej Exp $ ");
 /*
  * Driver for the AMD Family 15h (model 60+) and 17h CPU
  * System Management Network.
  */
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <sys/module.h>
 @@ -114,28 +114,27 @@ amdsmn_match(device_t parent, cfdata_t m
 	for (i = 0; i < __arraycount(amdsmn_ids); i++)
 		if (PCI_PRODUCT(pa->pa_id) == amdsmn_ids[i].amdsmn_deviceid)
 			return 2;
 	return 0;
+}
 static int
 amdsmn_misc_search(device_t parent, cfdata_t cf, const int *locs, void *aux)
+{
 	if (config_probe(parent, cf, aux))
 		config_attach(parent, cf, aux, NULL,
-		    CFARG_LOCATORS, locs,
+		    CFARGS(.locators = locs));
 		    CFARG_EOL);
 	return 0;
+}
 static void
 amdsmn_attach(device_t parent, device_t self, void *aux)
+{
 	struct amdsmn_softc *sc = device_private(self);
 	struct pci_attach_args *pa = aux;
 	size_t i;
 	mutex_init(&sc->smn_lock, MUTEX_DEFAULT, IPL_NONE);
 	sc->pa = *pa;
 @@ -149,28 +148,27 @@ amdsmn_attach(device_t parent, device_t
+		}
 	// aprint_normal(": AMD Family 17h System Management Network\n");
 	aprint_normal(": AMD System Management Network\n");
 	amdsmn_rescan(self, NULL, NULL);
+}
 static int
 amdsmn_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct amdsmn_softc *sc = device_private(self);
 	config_search(self, &sc->pa,
-	    CFARG_SEARCH, amdsmn_misc_search,
+	    CFARGS(.search = amdsmn_misc_search));
 	    CFARG_EOL);
 	return 0;
+}
 static int
 amdsmn_detach(device_t self, int flags)
+{
 	struct amdsmn_softc *sc = device_private(self);
 	mutex_destroy(&sc->smn_lock);
 	aprint_normal_dev(self,"detach!\n");
 	return 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: dwiic_pci.c,v 1.5 2021/05/29 09:47:28 riastradh Exp $ */
+/* $NetBSD: dwiic_pci.c,v 1.5.4.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,27 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Synopsys DesignWare I2C controller, PCI front-end
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.5 2021/05/29 09:47:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_pci.c,v 1.5.4.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_pci.h>
 #include <dev/acpi/acpi_util.h>
 #include <dev/acpi/acpi_i2c.h>
 @@ -166,27 +166,27 @@ pci_dwiic_attach(device_t parent, device
 	sc->sc_acpinode = acpi_pcidev_find(0 /*XXX segment*/,
 	    pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (sc->sc_acpinode) {
 		sc->sc_dwiic.sc_iba.iba_child_devices =
 		    acpi_enter_i2c_devs(NULL, sc->sc_acpinode);
 	} else {
 		aprint_verbose_dev(self, "no matching ACPI node\n");
+	}
 	dwiic_attach(&sc->sc_dwiic);
-	config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print, CFARG_EOL);
+	config_found(self, &sc->sc_dwiic.sc_iba, iicbus_print, CFARGS_NONE);
 	pmf_device_register(self, dwiic_suspend, dwiic_resume);
 out:
 	return;
+}
 static bool
 dwiic_pci_power(struct dwiic_softc *dwsc, bool power)
+{
 	struct pci_dwiic_softc *sc = container_of(dwsc, struct pci_dwiic_softc,
 	    sc_dwiic);
 	pcireg_t pmreg, csr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ichlpcib.c,v 1.53 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.53.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Minoura Makoto and Matthew R. Green.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,27 +30,27 @@
  */
 /*
  * Intel I/O Controller Hub (ICHn) LPC Interface Bridge driver
+ *
  *  LPC Interface Bridge is basically a pcib (PCI-ISA Bridge), but has
  *  some power management and monitoring functions.
  *  Currently we support the watchdog timer, SpeedStep (on some systems),
  *  the gpio interface, hpet timer, hardware random number generator,
  *  and the power management timer.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.53 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.53.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <sys/timetc.h>
 #include <sys/gpio.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -633,28 +633,27 @@ static void
 tcotimer_configure(device_t self)
+{
 	struct lpcib_softc *sc = device_private(self);
 	struct lpcib_tco_attach_args arg;
 	arg.ta_iot = sc->sc_iot;
 	arg.ta_ioh = sc->sc_ioh;
 	arg.ta_rcbat = sc->sc_rcbat;
 	arg.ta_rcbah = sc->sc_rcbah;
 	arg.ta_has_rcba = sc->sc_has_rcba;
 	arg.ta_pcib = &(sc->sc_pcib);
 	sc->sc_tco = config_found(self, &arg, NULL,
-	    CFARG_IATTR, "tcoichbus",
+	    CFARGS(.iattr = "tcoichbus"));
 	    CFARG_EOL);
+}
 static int
 tcotimer_unconfigure(device_t self, int flags)
+{
 	struct lpcib_softc *sc = device_private(self);
 	int rc;
 	if (sc->sc_tco != NULL &&
 	    (rc = config_detach(sc->sc_tco, flags)) != 0)
 		return rc;
 	return 0;
 @@ -862,28 +861,27 @@ lpcib_hpet_configure(device_t self)
+		}
 		val |= LPCIB_RCBA_HPTC_EN;
 		bus_space_write_4(sc->sc_rcbat, sc->sc_rcbah, LPCIB_RCBA_HPTC,
 		    val);
 	} else {
 		/* No HPET here */
 		return;
+	}
 	arg.hpet_mem_t = sc->sc_pa.pa_memt;
 	arg.hpet_reg = hpet_reg;
 	sc->sc_hpetbus = config_found(self, &arg, NULL,
-	    CFARG_IATTR, "hpetichbus",
+	    CFARGS(.iattr = "hpetichbus"));
 	    CFARG_EOL);
+}
 static int
 lpcib_hpet_unconfigure(device_t self, int flags)
+{
 	struct lpcib_softc *sc = device_private(self);
 	int rc;
 	if (sc->sc_hpetbus != NULL &&
 	    (rc = config_detach(sc->sc_hpetbus, flags)) != 0)
 		return rc;
 	return 0;
 @@ -972,28 +970,27 @@ lpcib_gpio_configure(device_t self)
 	/* Create controller tag */
 	sc->sc_gpio_gc.gp_cookie = sc;
 	sc->sc_gpio_gc.gp_pin_read = lpcib_gpio_pin_read;
 	sc->sc_gpio_gc.gp_pin_write = lpcib_gpio_pin_write;
 	sc->sc_gpio_gc.gp_pin_ctl = lpcib_gpio_pin_ctl;
 	memset(&gba, 0, sizeof(gba));
 	gba.gba_gc = &sc->sc_gpio_gc;
 	gba.gba_pins = sc->sc_gpio_pins;
 	gba.gba_npins = LPCIB_GPIO_NPINS;
 	sc->sc_gpiobus = config_found(self, &gba, gpiobus_print,
-	    CFARG_IATTR, "gpiobus",
+	    CFARGS(.iattr = "gpiobus"));
 	    CFARG_EOL);
+}
 static int
 lpcib_gpio_unconfigure(device_t self, int flags)
+{
 	struct lpcib_softc *sc = device_private(self);
 	int rc;
 	if (sc->sc_gpiobus != NULL &&
 	    (rc = config_detach(sc->sc_gpiobus, flags)) != 0)
 		return rc;
 	mutex_destroy(&sc->sc_gpio_mtx);
 @@ -1097,28 +1094,27 @@ lpcib_fwh_configure(device_t self)
 		 * Very unlikely to find a 82802 on a ICH6 or newer.
 		 * Also the write enable register moved at that point.
 		 */
 		return;
 	} else {
 		/* Enable FWH write to identify FWH. */
 		pr = pci_conf_read(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
 		    LPCIB_PCI_BIOS_CNTL);
 		pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
 		    LPCIB_PCI_BIOS_CNTL, pr|LPCIB_PCI_BIOS_CNTL_BWE);
+	}
 	sc->sc_fwhbus = config_found(self, NULL, NULL,
-	    CFARG_IATTR, "fwhichbus",
+	    CFARGS(.iattr = "fwhichbus"));
 	    CFARG_EOL);
 	/* restore previous write enable setting */
 	pci_conf_write(sc->sc_pcib.sc_pc, sc->sc_pcib.sc_tag,
 	    LPCIB_PCI_BIOS_CNTL, pr);
+}
 static int
 lpcib_fwh_unconfigure(device_t self, int flags)
+{
 	struct lpcib_softc *sc = device_private(self);
 	int rc;
 	if (sc->sc_fwhbus != NULL &&

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pchb.c,v 1.36 2021/04/24 23:36:51 thorpej Exp $ */
+/*	$NetBSD: pchb.c,v 1.36.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.36 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.36.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -408,45 +408,43 @@ pchbattach(device_t parent, device_t sel
 	if (!pmf_device_register(self, pchb_suspend, pchb_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	/*
 	 * If we haven't detected AGP yet (via a product ID),
 	 * then check for AGP capability on the device.
 	 */
 	if (has_agp ||
 	    pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_AGP,
 			       NULL, NULL) != 0) {
 		apa.apa_pci_args = *pa;
 		config_found(self, &apa, agpbusprint,
-		    CFARG_IATTR, "agpbus",
+		    CFARGS(.iattr = "agpbus"));
 		    CFARG_EOL);
+	}
 	if (doattach) {
 		pba.pba_iot = pa->pa_iot;
 		pba.pba_memt = pa->pa_memt;
 		pba.pba_dmat = pa->pa_dmat;
 		pba.pba_dmat64 = pa->pa_dmat64;
 		pba.pba_pc = pa->pa_pc;
 		pba.pba_flags = attachflags;
 		pba.pba_bus = pbnum;
 		pba.pba_bridgetag = NULL;
 		pba.pba_pc = pa->pa_pc;
 		pba.pba_intrswiz = 0;
 		memset(&pba.pba_intrtag, 0, sizeof(pba.pba_intrtag));
 		config_found(self, &pba, pcibusprint,
-		    CFARG_IATTR, "pcibus",
+		    CFARGS(.iattr = "pcibus"));
 		    CFARG_EOL);
+	}
+}
 static int
 pchbdetach(device_t self, int flags)
+{
 	int rc;
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 	pmf_device_deregister(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcib.c,v 1.20 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.20.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.20.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -235,24 +235,23 @@ pcibrescan(device_t self, const char *if
 	 */
 	if (ifattr_match(ifattr, "isabus") && sc->sc_isabus == NULL) {
 		/*
 		 * Attach the ISA bus behind this bridge.
 		 */
 		memset(&iba, 0, sizeof(iba));
 		iba.iba_iot = x86_bus_space_io;
 		iba.iba_memt = x86_bus_space_mem;
 #if NISA > 0
 		iba.iba_dmat = &isa_bus_dma_tag;
 #endif
 		sc->sc_isabus =
 		    config_found(self, &iba, isabusprint,
-			CFARG_IATTR, "isabus",
+			CFARGS(.iattr = "isabus"));
 			CFARG_EOL);
+	}
 	return 0;
+}
 void
 pcib_callback(device_t self)
+{
 	pcibrescan(self, "isabus", NULL);
+}

 @@ -1,38 +1,38 @@
-/*	$NetBSD: tcpcib.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: tcpcib.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*	$OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $	*/
 /*
  * Copyright (c) 2012 Matt Dainty <matt@bodgit-n-scarper.com>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*
  * Intel Atom E600 series LPC bridge also containing HPET and watchdog
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcpcib.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcpcib.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/i82801lpcvar.h>
 @@ -265,28 +265,27 @@ tcpcib_detach(device_t self, int flags)
+}
 static int
 tcpcib_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct tcpcib_softc *sc = device_private(self);
 	if (ifattr_match(ifattr, "hpetichbus") && sc->sc_hpetbus == NULL) {
 		struct lpcib_hpet_attach_args hpet_arg;
 		hpet_arg.hpet_mem_t = sc->sc_hpet_memt;
 		hpet_arg.hpet_reg = E600_HPET_BASE;
 		sc->sc_hpetbus =
 		    config_found(self, &hpet_arg, NULL,
-				 CFARG_IATTR, "hpetichbus",
+				 CFARGS(.iattr = "hpetichbus"));
 				 CFARG_EOL);
+	}
 	return pcibrescan(self, ifattr, locators);
+}
 static void
 tcpcib_childdet(device_t self, device_t child)
+{
 	struct tcpcib_softc *sc = device_private(self);
 	if (sc->sc_hpetbus == child) {
 		sc->sc_hpetbus = NULL;
 		return;

 @@ -1,14 +1,14 @@
-/* $NetBSD: imc.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: imc.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -55,27 +55,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Driver to expose the SMBus controllers in Intel's Integrated
  * Memory Controllers in certain CPUs.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.3 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.3.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/errno.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include "imcsmb_reg.h"
 @@ -236,27 +236,27 @@ imc_rescan(device_t self, const char *if
 	struct imc_softc *sc = device_private(self);
 	struct imc_attach_args imca;
 	int unit;
 	for (unit = 0; unit < 2; unit++) {
 		if (sc->sc_smbchild[unit] != NULL)
 			continue;
 		imca.ia_unit = unit;
 		imca.ia_regs = &imcsmb_regs[unit];
 		imca.ia_pci_tag = sc->sc_pci_tag;
 		imca.ia_pci_chipset_tag = sc->sc_pci_chipset_tag;
 		sc->sc_smbchild[unit] =
-		    config_found(self, &imca, NULL, CFARG_EOL);
+		    config_found(self, &imca, NULL, CFARGS_NONE);
+	}
 	return 0;
+}
 /*
  * device_detach() method. attach() didn't do any allocations, so there's
  * nothing special needed
  */
 static int
 imc_detach(device_t self, int flags)
+{
 	struct imc_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/* $NetBSD: imcsmb.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: imcsmb.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -56,27 +56,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Driver for the SMBus controllers in Intel's Integrated Memory Controllers
  * in certain CPUs.  A more detailed description of this device is present
  * in imc.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imcsmb.c,v 1.4 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imcsmb.c,v 1.4.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -145,27 +145,27 @@ imcsmb_rescan(device_t self, const char
 	/* Create the i2cbus child */
 	if (sc->sc_smbus != NULL)
 		return 0;
 	iic_tag_init(&sc->sc_i2c_tag);
 	sc->sc_i2c_tag.ic_cookie = sc;
 	sc->sc_i2c_tag.ic_acquire_bus = imcsmb_acquire_bus;
 	sc->sc_i2c_tag.ic_release_bus = imcsmb_release_bus;
 	sc->sc_i2c_tag.ic_exec = imcsmb_exec;
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c_tag;
-	sc->sc_smbus = config_found(self, &iba, iicbus_print, CFARG_EOL);
+	sc->sc_smbus = config_found(self, &iba, iicbus_print, CFARGS_NONE);
 	if (sc->sc_smbus == NULL) {
 		aprint_normal_dev(self, "no child found\n");
 		return ENXIO;
+	}
 	return 0;
+}
 static void
 imcsmb_chdet(device_t self, device_t child)
+{
 	struct imcsmb_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.200 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: cpu.c,v 1.200.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*
  * Copyright (c) 2000-2020 NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.200 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.200.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_multiprocessor.h"
 #include "opt_svs.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "acpica.h"
 #include "hpet.h"
 #include <sys/param.h>
 @@ -577,52 +577,48 @@ cpu_rescan(device_t self, const char *if
 	 * their featurebus info, since it wasn't retrieved.
 	 */
 	if (ci == NULL)
 		return 0;
 	memset(&cfaa, 0, sizeof(cfaa));
 	cfaa.ci = ci;
 	if (ifattr_match(ifattr, "cpufeaturebus")) {
 		if (ci->ci_frequency == NULL) {
 			cfaa.name = "frequency";
 			ci->ci_frequency =
 			    config_found(self, &cfaa, NULL,
-					 CFARG_IATTR, "cpufeaturebus",
+					 CFARGS(.iattr = "cpufeaturebus"));
 					 CFARG_EOL);
+		}
 		if (ci->ci_padlock == NULL) {
 			cfaa.name = "padlock";
 			ci->ci_padlock =
 			    config_found(self, &cfaa, NULL,
-					 CFARG_IATTR, "cpufeaturebus",
+					 CFARGS(.iattr = "cpufeaturebus"));
 					 CFARG_EOL);
+		}
 		if (ci->ci_temperature == NULL) {
 			cfaa.name = "temperature";
 			ci->ci_temperature =
 			    config_found(self, &cfaa, NULL,
-					 CFARG_IATTR, "cpufeaturebus",
+					 CFARGS(.iattr = "cpufeaturebus"));
 					 CFARG_EOL);
+		}
 		if (ci->ci_vm == NULL) {
 			cfaa.name = "vm";
 			ci->ci_vm =
 			    config_found(self, &cfaa, NULL,
-					 CFARG_IATTR, "cpufeaturebus",
+					 CFARGS(.iattr = "cpufeaturebus"));
 					 CFARG_EOL);
+		}
+	}
 	return 0;
+}
 static void
 cpu_childdetached(device_t self, device_t child)
+{
 	struct cpu_softc *sc = device_private(self);
 	struct cpu_info *ci = sc->sc_info;
 	if (ci->ci_frequency == child)

 @@ -1,14 +1,14 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $ */
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include "opt_pcifixup.h"
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <machine/cpuvar.h>
 #include <machine/mpbiosvar.h>
 @@ -187,28 +187,27 @@ x86_cpubus_attach(device_t self)
 		if (mpbios_probe(self))
 			mpbios_scan(self, &numcpus);
 		else
 #endif
 		if (numcpus == 0) {
 			struct cpu_attach_args caa;
 			memset(&caa, 0, sizeof(caa));
 			caa.cpu_number = 0;
 			caa.cpu_role = CPU_ROLE_SP;
 			caa.cpu_func = 0;
 			config_found(self, &caa, mainbus_cpu_print,
-			    CFARG_IATTR, "cpubus",
+			    CFARGS(.iattr = "cpubus"));
 			    CFARG_EOL);
+		}
 #if NACPICA > 0
+	}
 #endif
+}
 int
 mainbus_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mp.c,v 1.5 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: mp.c,v 1.5.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.5 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.5.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "opt_multiprocessor.h"
 #include "opt_acpi.h"
 #include "acpica.h"
 #include "ioapic.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -84,28 +84,27 @@ mp_pci_scan(device_t self, struct pcibus
 	        cfprint_t print)
+{
 	int i, cnt;
 	struct mp_bus *mpb;
 	cnt = 0;
 	for (i = 0; i < mp_nbus; i++) {
 		mpb = &mp_busses[i];
 		if (mpb->mb_name == NULL)
 			continue;
 		if (strcmp(mpb->mb_name, "pci") == 0 && mpb->mb_dev == NULL) {
 			pba->pba_bus = i;
 			mpb->mb_dev = config_found(self, pba, print,
-			    CFARG_IATTR, "pcibus",
+			    CFARGS(.iattr = "pcibus"));
 			    CFARG_EOL);
 			cnt++;
+		}
+	}
 	return cnt;
+}
 void
 mp_pci_childdetached(device_t self, device_t child)
+{
 	int i;
 	struct mp_bus *mpb;
 	for (i = 0; i < mp_nbus; i++) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpacpi.c,v 1.106 2021/05/12 22:17:40 thorpej Exp $	*/
+/*	$NetBSD: mpacpi.c,v 1.106.4.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.106 2021/05/12 22:17:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.106.4.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "acpica.h"
 #include "opt_acpi.h"
 #include "opt_ddb.h"
 #include "opt_mpbios.h"
 #include "opt_multiprocessor.h"
 #include "pchb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 @@ -374,88 +374,85 @@ mpacpi_config_cpu(ACPI_SUBTABLE_HEADER *
 	switch (hdrp->Type) {
 	case ACPI_MADT_TYPE_LOCAL_APIC:
 		lapic = (ACPI_MADT_LOCAL_APIC *)hdrp;
 		if (lapic->LapicFlags & ACPI_MADT_ENABLED) {
 			if (lapic->Id != cpunum)
 				caa.cpu_role = CPU_ROLE_AP;
 			else
 				caa.cpu_role = CPU_ROLE_BP;
 			caa.cpu_id = lapic->ProcessorId;
 			caa.cpu_number = lapic->Id;
 			caa.cpu_func = &mp_cpu_funcs;
 			locs[CPUBUSCF_APID] = caa.cpu_number;
 			config_found(parent, &caa, mpacpi_cpuprint,
-			    CFARG_SUBMATCH, config_stdsubmatch,
+			    CFARGS(.submatch = config_stdsubmatch,
-			    CFARG_IATTR, "cpubus",
+				   .iattr = "cpubus",
-			    CFARG_LOCATORS, locs,
+				   .locators = locs));
 			    CFARG_EOL);
+		}
 		break;
 	case ACPI_MADT_TYPE_LOCAL_X2APIC:
 		x2apic = (ACPI_MADT_LOCAL_X2APIC *)hdrp;
 		/* ACPI spec: "Logical processors with APIC ID values
 		 * less than 255 must use the Processor Local APIC
 		 * structure to convey their APIC information to OSPM."
 		 */
 		if (x2apic->LocalApicId <= 0xff) {
 			printf("bogus MADT X2APIC entry (id = 0x%"PRIx32")\n",
 			    x2apic->LocalApicId);
 			break;
+		}
 		if (x2apic->LapicFlags & ACPI_MADT_ENABLED) {
 			if (x2apic->LocalApicId != cpunum)
 				caa.cpu_role = CPU_ROLE_AP;
 			else
 				caa.cpu_role = CPU_ROLE_BP;
 			caa.cpu_id = x2apic->Uid;
 			caa.cpu_number = x2apic->LocalApicId;
 			caa.cpu_func = &mp_cpu_funcs;
 			locs[CPUBUSCF_APID] = caa.cpu_number;
 			config_found(parent, &caa, mpacpi_cpuprint,
-			    CFARG_SUBMATCH, config_stdsubmatch,
+			    CFARGS(.submatch = config_stdsubmatch,
-			    CFARG_IATTR, "cpubus",
+				   .iattr = "cpubus",
-			    CFARG_LOCATORS, locs,
+				   .locators = locs));
 			    CFARG_EOL);
+		}
 		break;
+	}
 	return AE_OK;
+}
 static ACPI_STATUS
 mpacpi_config_ioapic(ACPI_SUBTABLE_HEADER *hdrp, void *aux)
+{
 	device_t parent = aux;
 	struct apic_attach_args aaa;
 	ACPI_MADT_IO_APIC *p;
 	int locs[IOAPICBUSCF_NLOCS];
 	if (hdrp->Type == ACPI_MADT_TYPE_IO_APIC) {
 		p = (ACPI_MADT_IO_APIC *)hdrp;
 		aaa.apic_id = p->Id;
 		aaa.apic_address = p->Address;
 		aaa.apic_version = -1;
 		aaa.flags = IOAPIC_VWIRE;
 		aaa.apic_vecbase = p->GlobalIrqBase;
 		locs[IOAPICBUSCF_APID] = aaa.apic_id;
 		config_found(parent, &aaa, mpacpi_ioapicprint,
-		    CFARG_SUBMATCH, config_stdsubmatch,
+		    CFARGS(.submatch = config_stdsubmatch,
-		    CFARG_IATTR, "ioapicbus",
+			   .iattr = "ioapicbus",
-		    CFARG_LOCATORS, locs,
+			   .locators = locs));
 		    CFARG_EOL);
+	}
 	return AE_OK;
+}
 int
 mpacpi_scan_apics(device_t self, int *ncpup)
+{
 	int rv = 0;
 	if (acpi_madt_map() != AE_OK)
 		return 0;
 	mpacpi_ncpu = mpacpi_nintsrc = mpacpi_nioapic = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mpbios.c,v 1.69 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: mpbios.c,v 1.69.8.1 2021/08/04 03:03:30 thorpej Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -86,27 +86,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * The Intel MP-stuff is just one way of x86 SMP systems
  * so only Intel MP specific stuff is here.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.69 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.69.8.1 2021/08/04 03:03:30 thorpej Exp $");
 #include "acpica.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include "opt_acpi.h"
 #include "opt_mpbios.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 @@ -809,30 +809,29 @@ mpbios_cpu(const uint8_t *ent, device_t
 	/* check for BSP flag */
 	if (entry->cpu_flags & PROCENTRY_FLAG_BP)
 		caa.cpu_role = CPU_ROLE_BP;
 	else
 		caa.cpu_role = CPU_ROLE_AP;
 	caa.cpu_id = entry->apic_id;
 	caa.cpu_number = entry->apic_id;
 	caa.cpu_func = &mp_cpu_funcs;
 	locs[CPUBUSCF_APID] = caa.cpu_number;
 	config_found(self, &caa, mp_cpuprint,
-	    CFARG_SUBMATCH, config_stdsubmatch,
+	    CFARGS(.submatch = config_stdsubmatch,
-	    CFARG_IATTR, "cpubus",
+		   .iattr = "cpubus",
-	    CFARG_LOCATORS, locs,
+		   .locators = locs));
 	    CFARG_EOL);
+}
 static void
 mpbios_dflt_conf_cpu(device_t self)
+{
 	struct mpbios_proc mpp;
 	/* mpp.type and mpp.apic_version are irrelevant for mpbios_cpu(). */
 	/*
 	 * Default configurations always feature two processors and the local
 	 * APIC IDs are assigned consecutively by hardware starting from zero
 	 * (sec. 5). Just determine the BSP (APIC ID).
 	 */
 @@ -1239,30 +1238,29 @@ mpbios_ioapic(const uint8_t *ent, device
 #if NIOAPIC > 0
+	{
 	int locs[IOAPICBUSCF_NLOCS];
 	struct apic_attach_args aaa;
 	aaa.apic_id = entry->apic_id;
 	aaa.apic_version = entry->apic_version;
 	aaa.apic_address = (paddr_t)entry->apic_address;
 	aaa.apic_vecbase = -1;
 	aaa.flags = (mp_fps->mpfb2 & 0x80) ? IOAPIC_PICMODE : IOAPIC_VWIRE;
 	locs[IOAPICBUSCF_APID] = aaa.apic_id;
 	config_found(self, &aaa, mp_ioapicprint,
-	    CFARG_SUBMATCH, config_stdsubmatch,
+	    CFARGS(.submatch = config_stdsubmatch,
-	    CFARG_IATTR, "ioapicbus",
+		   .iattr = "ioapicbus",
-	    CFARG_LOCATORS, locs,
+		   .locators = locs));
 	    CFARG_EOL);
+	}
 #endif
+}
 static const char inttype_fmt[] = "\177\020"
 		"f\0\2type\0" "=\1NMI\0" "=\2SMI\0" "=\3ExtINT\0";
 static const char flagtype_fmt[] = "\177\020"
 		"f\0\2pol\0" "=\1Act Hi\0" "=\3Act Lo\0"
 		"f\2\2trig\0" "=\1Edge\0" "=\3Level\0";
 static void
 mpbios_int(const uint8_t *ent, int enttype, struct mp_intr_map *mpi)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.140 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: cpu.c,v 1.140.8.1 2021/08/04 03:03:31 thorpej Exp $	*/
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -55,27 +55,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140.8.1 2021/08/04 03:03:31 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_xen.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -252,28 +252,27 @@ cpu_rescan(device_t self, const char *if
 	struct cpu_softc *sc = device_private(self);
 	struct cpufeature_attach_args cfaa;
 	struct cpu_info *ci = sc->sc_info;
 	memset(&cfaa, 0, sizeof(cfaa));
 	cfaa.ci = ci;
 	if (ifattr_match(ifattr, "cpufeaturebus")) {
 		if (ci->ci_frequency == NULL) {
 			cfaa.name = "frequency";
 			ci->ci_frequency =
 			    config_found(self, &cfaa, NULL,
-					 CFARG_IATTR, "cpufeaturebus",
+					 CFARGS(.iattr = "cpufeaturebus"));
 					 CFARG_EOL);
+		}
+	}
 	return 0;
+}
 static void
 cpu_childdetached(device_t self, device_t child)
+{
 	struct cpu_softc *sc = device_private(self);
 	struct cpu_info *ci = sc->sc_info;
 	if (ci->ci_frequency == child)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xen_mainbus.c,v 1.9 2021/04/24 23:36:51 thorpej Exp $	*/
+/*	$NetBSD: xen_mainbus.c,v 1.9.8.1 2021/08/04 03:03:31 thorpej Exp $	*/
 /*	NetBSD: mainbus.c,v 1.19 2017/05/23 08:54:39 nonaka Exp 	*/
 /*	NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp 	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -23,27 +23,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.9 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_mainbus.c,v 1.9.8.1 2021/08/04 03:03:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include "hypervisor.h"
 #include "pci.h"
 #include "opt_xen.h"
 #include "opt_mpbios.h"
 #include "opt_pcifixup.h"
 @@ -119,36 +119,34 @@ union xen_mainbus_attach_args {
 void
 xen_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	union xen_mainbus_attach_args mba;
 	switch(vm_guest) {
 	case VM_GUEST_XENPV:
 #if NIPMI > 0 && defined(XENPV)
 		memset(&mba.mba_ipmi, 0, sizeof(mba.mba_ipmi));
 		mba.mba_ipmi.iaa_iot = x86_bus_space_io;
 		mba.mba_ipmi.iaa_memt = x86_bus_space_mem;
 		if (ipmi_probe(&mba.mba_ipmi))
 			config_found(self, &mba.mba_ipmi, NULL,
-			    CFARG_IATTR, "ipmibus",
+			    CFARGS(.iattr = "ipmibus"));
 			    CFARG_EOL);
 #endif
 	/* FALLTHROUGH */
 	case VM_GUEST_XENPVH:
 	case VM_GUEST_XENPVHVM:
 		mba.mba_haa.haa_busname = "hypervisor";
 		config_found(self, &mba.mba_haa, xen_mainbus_print,
-		    CFARG_IATTR, "hypervisorbus",
+		    CFARGS(.iattr = "hypervisorbus"));
 		    CFARG_EOL);
 		break;
 	default:
 		return;
+	}
 	if (vm_guest == VM_GUEST_XENPV) {
 		/* save/restore for Xen */
 		if (!pmf_device_register(self, NULL, NULL))
 			aprint_error_dev(self,
 			    "couldn't establish power handler\n");
+	}
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.91 2021/04/24 23:36:51 thorpej Exp $ */
+/* $NetBSD: hypervisor.c,v 1.91.8.1 2021/08/04 03:03:31 thorpej Exp $ */
 /*
  * Copyright (c) 2005 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -43,27 +43,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.91 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.91.8.1 2021/08/04 03:03:31 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include "xenbus.h"
 #include "xencons.h"
 #include "isa.h"
 #include "pci.h"
 #include "acpica.h"
 #include "kernfs.h"
 @@ -631,141 +631,134 @@ hypervisor_attach(device_t parent, devic
 #undef XEN_TST_F
 	aprint_verbose("\n");
 	xengnt_init();
 	events_init();
 #ifdef XENPV
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_vcaa.vcaa_name = "vcpu";
 	hac.hac_vcaa.vcaa_caa.cpu_number = 0;
 	hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_BP;
 	hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
 	config_found(self, &hac.hac_vcaa, hypervisor_print,
-	    CFARG_IATTR, "xendevbus",
+	    CFARGS(.iattr = "xendevbus"));
 	    CFARG_EOL);
 #ifdef MULTIPROCESSOR
 	/*
 	 * The xenstore contains the configured number of vcpus.
 	 * The xenstore however, is not accessible until much later in
 	 * the boot sequence. We therefore bruteforce check for
 	 * allocated vcpus (See: cpu.c:vcpu_match()) by iterating
 	 * through the maximum supported by NetBSD MP.
 	 */
 	cpuid_t vcpuid;
 	for (vcpuid = 1; vcpuid < maxcpus; vcpuid++) {
 		memset(&hac, 0, sizeof(hac));
 		hac.hac_vcaa.vcaa_name = "vcpu";
 		hac.hac_vcaa.vcaa_caa.cpu_number = vcpuid;
 		hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_AP;
 		hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
 		if (NULL == config_found(self, &hac.hac_vcaa,
 					 hypervisor_vcpu_print,
-					 CFARG_IATTR, "xendevbus",
+					 CFARGS(.iattr = "xendevbus"))) {
 					 CFARG_EOL)) {
 			break;
+		}
+	}
 #endif /* MULTIPROCESSOR */
 #endif /* XENPV */
 #if NXENBUS > 0
 	extern struct x86_bus_dma_tag xenbus_bus_dma_tag;
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_xenbus.xa_device = "xenbus";
 	hac.hac_xenbus.xa_dmat = &xenbus_bus_dma_tag;
 	config_found(self, &hac.hac_xenbus, hypervisor_print,
-	    CFARG_IATTR, "xendevbus",
+	    CFARGS(.iattr = "xendevbus"));
 	    CFARG_EOL);
 #endif
 #if NXENCONS > 0
 	if (xencons_interface != 0 || vm_guest != VM_GUEST_XENPVHVM) {
 		memset(&hac, 0, sizeof(hac));
 		hac.hac_xencons.xa_device = "xencons";
 		config_found(self, &hac.hac_xencons, hypervisor_print,
-		    CFARG_IATTR, "xendevbus",
+		    CFARGS(.iattr = "xendevbus"));
 		    CFARG_EOL);
+	}
 #endif
 #if defined(DOM0OPS)
 #if defined(XENPV)
 #if NPCI > 0
 #if NACPICA > 0
 	if (acpi_present) {
 		memset(&hac, 0, sizeof(hac));
 		hac.hac_acpi.aa_iot = x86_bus_space_io;
 		hac.hac_acpi.aa_memt = x86_bus_space_mem;
 		hac.hac_acpi.aa_pc = NULL;
 		hac.hac_acpi.aa_pciflags =
 			PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 			PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
 			PCI_FLAGS_MWI_OKAY;
 		hac.hac_acpi.aa_ic = &x86_isa_chipset;
 		hac.hac_acpi.aa_dmat = &pci_bus_dma_tag;
 #ifdef _LP64
 		hac.hac_acpi.aa_dmat64 = &pci_bus_dma64_tag;
 #else
 		hac.hac_acpi.aa_dmat64 = NULL;
 #endif /* _LP64 */
 		config_found(self, &hac.hac_acpi, NULL,
-		    CFARG_IATTR, "acpibus",
+		    CFARGS(.iattr = "acpibus"));
 		    CFARG_EOL);
+	}
 #endif /* NACPICA */
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_pba.pba_iot = x86_bus_space_io;
 	hac.hac_pba.pba_memt = x86_bus_space_mem;
 	hac.hac_pba.pba_dmat = &pci_bus_dma_tag;
 #ifdef _LP64
 	hac.hac_pba.pba_dmat64 = &pci_bus_dma64_tag;
 #else
 	hac.hac_pba.pba_dmat64 = NULL;
 #endif /* _LP64 */
 	hac.hac_pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
 	hac.hac_pba.pba_bridgetag = NULL;
 	hac.hac_pba.pba_bus = 0;
 #if NACPICA > 0 && defined(ACPI_SCANPCI)
 	if (mpacpi_active)
 		mp_pci_scan(self, &hac.hac_pba, pcibusprint);
 	else
 #endif
 #if defined(MPBIOS) && defined(MPBIOS_SCANPCI)
 	if (mpbios_scanned != 0)
 		mp_pci_scan(self, &hac.hac_pba, pcibusprint);
 	else
 #endif
 	config_found(self, &hac.hac_pba, pcibusprint,
-	    CFARG_IATTR, "pcibus",
+	    CFARGS(.iattr = "pcibus"));
 	    CFARG_EOL);
 #if NACPICA > 0
 	if (mp_verbose)
 		acpi_pci_link_state();
 #endif
 #if NISA > 0
 	if (isa_has_been_seen == 0) {
 		memset(&hac, 0, sizeof(hac));
 		hac.hac_iba._iba_busname = "isa";
 		hac.hac_iba.iba_iot = x86_bus_space_io;
 		hac.hac_iba.iba_memt = x86_bus_space_mem;
 		hac.hac_iba.iba_dmat = &isa_bus_dma_tag;
 		hac.hac_iba.iba_ic = NULL; /* No isa DMA yet */
 		config_found(self, &hac.hac_iba, isabusprint,
-		    CFARG_IATTR, "isabus",
+		    CFARGS(.iattr = "isabus"));
 		    CFARG_EOL);
+	}
 #endif /* NISA */
 #endif /* NPCI */
 #endif /* XENPV */
 	if (xendomain_is_privileged()) {
 		xenprivcmd_init();
+	}
 #endif /* DOM0OPS */
 	hypervisor_machdep_attach();
 	if (!pmf_device_register(self, hypervisor_suspend, hypervisor_resume))

 @@ -1,41 +1,41 @@
-/*      $NetBSD: xpci_xenbus.c,v 1.24 2021/04/24 23:36:51 thorpej Exp $      */
+/*      $NetBSD: xpci_xenbus.c,v 1.24.8.1 2021/08/04 03:03:31 thorpej Exp $      */
 /*
  * Copyright (c) 2009 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.24 2021/04/24 23:36:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.24.8.1 2021/08/04 03:03:31 thorpej Exp $");
 #include "opt_xen.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus_private.h>
 @@ -349,27 +349,27 @@ xpci_attach_pcibus(int domain, int busn)
 	memset(&pba, 0, sizeof(struct pcibus_attach_args));
 	pba.pba_iot = x86_bus_space_io;
 	pba.pba_memt = x86_bus_space_mem;
 	pba.pba_dmat = &pci_bus_dma_tag;
 #ifdef _LP64
 	pba.pba_dmat64 = &pci_bus_dma64_tag;
 #else
 	pba.pba_dmat64 = NULL;
 #endif
 	pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY |
 	    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 	pba.pba_bridgetag = NULL;
 	pba.pba_bus = busn;
-	config_found(xpci_sc->sc_dev, &pba, pcibusprint, CFARG_EOL);
+	config_found(xpci_sc->sc_dev, &pba, pcibusprint, CFARGS_NONE);
+}
 /* functions required by the MI PCI system */
 void
 pci_attach_hook(device_t parent, device_t self, struct pcibus_attach_args *pba)
+{
 	/* nothing */
+}
 int
 pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: xenbus_probe.c,v 1.57 2021/06/16 10:49:50 bouyer Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.57.2.1 2021/08/04 03:03:31 thorpej Exp $ */
 /******************************************************************************
  * Talks to Xen Store to figure out what devices we have.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
  * Copyright (C) 2005 Mike Wray, Hewlett-Packard
  * Copyright (C) 2005 XenSource Ltd
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (the "Software"), to deal in the Software without
  * restriction, including without limitation the rights to use, copy, modify,
 @@ -19,27 +19,27 @@
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.57 2021/06/16 10:49:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.57.2.1 2021/08/04 03:03:31 thorpej Exp $");
 #if 0
 #define DPRINTK(fmt, args...) \
     printf("xenbus_probe (%s:%d) " fmt ".\n", __func__, __LINE__, ##args)
 #else
 #define DPRINTK(fmt, args...) ((void)0)
 #endif
 #include <sys/types.h>
 #include <sys/null.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 @@ -462,27 +462,27 @@ xenbus_probe_device_type(const char *pat
+				}
+			}
 			err = read_backend_details(xbusd);
 			if (err != 0) {
 				aprint_error_dev(xenbus_dev,
 				    "can't get backend details for %s (%d)\n",
 				    xbusd->xbusd_path, err);
 				kmem_free(xbusd, xbusd->xbusd_sz);
 				break;
+			}
 			KERNEL_LOCK(1, curlwp);
 			xbusd->xbusd_u.f.f_dev = config_found(xenbus_dev,
-			    &xa, xenbus_print, CFARG_EOL);
+			    &xa, xenbus_print, CFARGS_NONE);
 			KERNEL_UNLOCK_ONE(curlwp);
 			if (xbusd->xbusd_u.f.f_dev == NULL) {
 				kmem_free(xbusd, xbusd->xbusd_sz);
 				continue;
+			}
+		}
 		SLIST_INSERT_HEAD(&xenbus_device_list,
 		    xbusd, xbusd_entries);
 		watch_otherend(xbusd);
+	}
 	xenbus_directory_free(orig_dir_n, dir);
 	if (lookup)
 		kmem_free(lookup, lookup_sz);
 @@ -647,27 +647,27 @@ xenbus_probe(void *unused)
 	strcpy(fe_watch.node, "device");
 	fe_watch.xbw_callback = frontend_changed;
 	register_xenbus_watch(&fe_watch);
 	be_watch.node_sz = strlen("backend") + 1;
 	be_watch.node = kmem_alloc(be_watch.node_sz, KM_SLEEP);
 	strcpy(be_watch.node, "backend");
 	be_watch.xbw_callback = backend_changed;
 	register_xenbus_watch(&be_watch);
 	/* attach balloon. */
 	KERNEL_LOCK(1, curlwp);
 	config_found(xenbus_dev, &balloon_xa, xenbus_print,
-	    CFARG_EOL);
+	    CFARGS_NONE);
 	KERNEL_UNLOCK_ONE(curlwp);
 	shutdown_xenbus_setup();
 	/* Notify others that xenstore is up */
 	//notifier_call_chain(&xenstore_chain, 0, NULL);
+}
 void
 xb_xenstored_make_ready(void)
+{
 	mutex_enter(&xenstored_lock);
 	xenstored_ready = 1;