 @@ -1,14 +1,14 @@
-/*	$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -21,27 +21,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>
-__RCSID("$NetBSD: htif.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: htif.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <riscv/locore.h>
 #include <riscv/htif/htif_var.h>
 static int htif_mainbus_match(device_t, cfdata_t, void *);
 static void htif_mainbus_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(htif_mainbus, 0,
     htif_mainbus_match, htif_mainbus_attach, NULL, NULL);
 @@ -58,17 +58,17 @@ htif_mainbus_match(device_t parent, cfda
 static int
 htif_mainbus_print(void *aux, const char *name)
+{
 	return QUIET;
+}
 void
 htif_mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct htif_attach_args haa;
 	haa.haa_name = "htifcons";
-	config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+	config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
 	haa.haa_name = "htifdisk";
-	config_found(self, &haa, htif_mainbus_print, CFARG_EOL);
+	config_found(self, &haa, htif_mainbus_print, CFARGS_NONE);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
  */
 #include "locators.h"
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__RCSID("$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <riscv/locore.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);
 @@ -62,15 +62,15 @@ int
 mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args maa;
 	maa.maa_name = "cpu";
 	maa.maa_instance = 0;
-	config_found(self, &maa, mainbus_print, CFARG_EOL);
+	config_found(self, &maa, mainbus_print, CFARGS_NONE);
+}

 @@ -18,27 +18,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: ioplanar.c,v 1.5 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.5.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <machine/intr.h>
 #include <dev/mca/mcavar.h>
 #include <dev/mca/mcadevs.h>
 #include <rs6000/ioplanar/ioplanarvar.h>
 static int	ioplanar_match(device_t, cfdata_t, void *);
 @@ -77,50 +77,49 @@ ioplanar_attach(device_t parent, device_
 	struct mca_attach_args *ma = aux;
 	aprint_normal("\n");
 	ioplanar_softc = sc;
 	sc->sc_dev = self;
 	sc->sc_ic = ma->ma_mc;
 	sc->sc_iot = ma->ma_iot;
 	sc->sc_memt = ma->ma_memt;
 	sc->sc_dmat = ma->ma_dmat;
 	sc->sc_devid = ma->ma_id;
 	config_search(self, aux,
-	    CFARG_SEARCH, ioplanar_search,
+	    CFARGS(.search = ioplanar_search));
 	    CFARG_EOL);
+}
 static int
 ioplanar_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct ioplanar_dev_attach_args idaa;
 	struct mca_attach_args *ma = aux;
 	int i;
 	idaa.idaa_mc = ma->ma_mc;
 	idaa.idaa_iot = ma->ma_iot;
 	idaa.idaa_memt = ma->ma_memt;
 	idaa.idaa_dmat = ma->ma_dmat;
 	idaa.idaa_devid = ma->ma_id;
 	switch (ma->ma_id) {
 	case MCA_PRODUCT_IBM_SIO_RAINBOW:
 		for (i=0; i < RAINBOW_DEVS; i++) {
 			idaa.idaa_device = rainbow_map[i];
 			if (config_probe(parent, cf, &idaa))
 				config_attach(parent, cf, &idaa,
-				    ioplanar_print, CFARG_EOL);
+				    ioplanar_print, CFARGS_NONE);
+		}
 		break;
 	default:
 		return 0;
+	}
 	return 0;
+}
 static int
 ioplanar_print(void *args, const char *name)
+{
 	/*struct ioplanar_dev_attach_args *idaa = args;*/

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 02:52:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * 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: mainbus.c,v 1.6 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <powerpc/pio.h>
 #include "mca.h"
 @@ -86,50 +86,47 @@ mainbus_attach(device_t parent, device_t
+{
 	union mainbus_attach_args mba;
 	struct confargs ca;
 #if DEBUG
 	int slot;
 #endif
 	mainbus_found = 1;
 	aprint_normal("\n");
 	ca.ca_name = "cpu";
 	ca.ca_node = 0;
 	config_found(self, &ca, mainbus_print,
-	    CFARG_IATTR, "mainbus",
+	    CFARGS(.iattr = "mainbus"));
 	    CFARG_EOL);
 #if DEBUG
 	printf("scanning MCA bus\n");
 	for (slot=0; slot < 16; slot++) {
 		printf("slot %d == %x%x\n", slot,
 		    inb(0xc0400100 + 1 + (slot<<16)),
 		    inb(0xc0400100 + 0 + (slot<<16)));
+	}
 	printf("done\n");
 	printf(" CFG reg (1)= %x\n", inl(0xc0010080));
 	printf(" TCE reg (1)= %x\n", inl(0xc001009c));
 #endif
 	mba.mba_mba.mba_iot = &rs6000_iocc0_io_space_tag;
 	mba.mba_mba.mba_memt = &rs6000_iocc0_io_space_tag; /* XXX ??? */
 	mba.mba_mba.mba_dmat = NULL; /*&mca_bus_dma_tag;*/
 	mba.mba_mba.mba_mc = NULL;
 	mba.mba_mba.mba_bus = 0;
 	config_found(self, &mba.mba_mba, mcabusprint,
-	    CFARG_IATTR, "mcabus",
+	    CFARGS(.iattr = "mcabus"));
 	    CFARG_EOL);
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	union mainbus_attach_args *mba = aux;
 	if (pnp)
 		aprint_normal("%s at %s", mba->mba_busname, pnp);
 	return (UNCONF);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: eumb.c,v 1.7 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: eumb.c,v 1.7.8.1 2021/08/04 02:52:59 thorpej Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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: eumb.c,v 1.7 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.7.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 #include <sandpoint/sandpoint/eumbvar.h>
 #include "locators.h"
 static int  eumb_match(device_t, cfdata_t, void *);
 @@ -60,41 +60,40 @@ eumb_match(device_t parent, cfdata_t cf,
 	if (strcmp(ma->ma_name, eumb_cd.cd_name) != 0)
 		return 0;
 	return 1;
+}
 static void
 eumb_attach(device_t parent, device_t self, void *aux)
+{
 	aprint_naive("\n");
 	aprint_normal("\n");
 	config_search(self, aux,
-	    CFARG_SEARCH, eumb_search,
+	    CFARGS(.search = eumb_search));
 	    CFARG_EOL);
+}
 static int
 eumb_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	struct eumb_attach_args eaa;
 	eaa.eumb_name = cf->cf_name;
 	eaa.eumb_bt = ma->ma_bst;
 	eaa.eumb_unit = cf->cf_loc[EUMBCF_UNIT];
         if (config_probe(parent, cf, &eaa))
-                config_attach(parent, cf, &eaa, eumb_print, CFARG_EOL);
+                config_attach(parent, cf, &eaa, eumb_print, CFARGS_NONE);
 	return 0;
+}
 static int
 eumb_print(void *aux, const char *pnp)
+{
 	struct eumb_attach_args *eaa = aux;
 	if (pnp)
 		printf("%s at %s", eaa->eumb_name, pnp);
 	if (eaa->eumb_unit != EUMBCF_UNIT_DEFAULT)
 		printf(" unit %d", eaa->eumb_unit);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.33 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.33.8.1 2021/08/04 02:52:59 thorpej 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
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,27 +21,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: mainbus.c,v 1.33 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 #include <machine/bootinfo.h>
 #include <machine/isa_machdep.h>
 @@ -82,50 +82,46 @@ mainbus_match(device_t parent, cfdata_t
  */
 void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args mba;
 	struct pcibus_attach_args pba;
 	struct btinfo_prodfamily *pfam;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	mba.ma_name = "cpu";
 	config_found(self, &mba, mainbus_print,
-	    CFARG_IATTR, "mainbus",
+	    CFARGS(.iattr = "mainbus"));
 	    CFARG_EOL);
 	mba.ma_name = "eumb";
 	mba.ma_bst = &sandpoint_eumb_space_tag;
 	config_found(self, &mba, mainbus_print,
-	    CFARG_IATTR, "mainbus",
+	    CFARGS(.iattr = "mainbus"));
 	    CFARG_EOL);
 	pfam = lookup_bootinfo(BTINFO_PRODFAMILY);
 	if (pfam != NULL && strcmp(pfam->name, "nhnas") == 0) {
 		/* attach nhpow(4) for NH230/231 only */
 		mba.ma_name = "nhpow";
 		mba.ma_bst = &sandpoint_nhgpio_space_tag;
 		config_found(self, &mba, mainbus_print,
-		    CFARG_IATTR, "mainbus",
+		    CFARGS(.iattr = "mainbus"));
 		    CFARG_EOL);
+	}
 	mba.ma_name = "cfi";
 	mba.ma_bst = &sandpoint_flash_space_tag;
 	config_found(self, &mba, mainbus_print,
-	    CFARG_IATTR, "mainbus",
+	    CFARGS(.iattr = "mainbus"));
 	    CFARG_EOL);
 	/*
 	 * XXX Note also that the presence of a PCI bus should
 	 * XXX _always_ be checked, and if present the bus should be
 	 * XXX 'found'.  However, because of the structure of the code,
 	 * XXX that's not currently possible.
 	 */
 #if NPCI > 0
 #if defined(PCI_NETBSD_CONFIGURE)
 	struct pciconf_resources *pcires = pciconf_resource_init();
 	pciconf_resource_add(pcires, PCICONF_RESOURCE_IO,
 	    PCI_IO_START, PCI_IO_SIZE);
 @@ -137,28 +133,27 @@ mainbus_attach(device_t parent, device_t
 	pciconf_resource_fini(pcires);
 #endif
 	pba.pba_iot = &sandpoint_io_space_tag;
 	pba.pba_memt = &sandpoint_mem_space_tag;
 	pba.pba_dmat = &pci_bus_dma_tag;
 	pba.pba_dmat64 = NULL;
 	pba.pba_bus = 0;
 	pba.pba_pc = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found(self, &pba, pcibusprint,
-	    CFARG_IATTR, "pcibus",
+	    CFARGS(.iattr = "pcibus"));
 	    CFARG_EOL);
 #endif
+}
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(cpu, 0, cpu_match, cpu_attach, NULL, NULL);
 extern struct cfdriver cpu_cd;
 int
 cpu_match(device_t parent, cfdata_t cf, void *aux)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: nhpow.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: nhpow.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $ */
 /*-
  * Copyright (c) 2012 Frank Wille.
  * All rights reserved.
+ *
  * Written by Frank Wille for The NetBSD Project.
+ *
  * 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
 @@ -22,27 +22,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.
  */
 /*
  * NH230/231 power and LED control, button handling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.3 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nhpow.c,v 1.3.8.1 2021/08/04 02:52:59 thorpej Exp $");
 #include "gpio.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #if NGPIO > 0
 #include <sys/gpio.h>
 #endif
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/sysctl.h>
 @@ -198,27 +198,27 @@ nhpow_attach(device_t parent, device_t s
 		sc->sc_gpio_pins[i].pin_state =
 		    (sc->sc_gpio_wrstate & (1 << i)) ?
 		    GPIO_PIN_HIGH : GPIO_PIN_LOW;
+	}
 	/* create controller tag and attach GPIO framework */
 	sc->sc_gpio_gc.gp_cookie = sc;
 	sc->sc_gpio_gc.gp_pin_read = nhgpio_pin_read;
 	sc->sc_gpio_gc.gp_pin_write = nhgpio_pin_write;
 	sc->sc_gpio_gc.gp_pin_ctl = nhgpio_pin_ctl;
 	gba.gba_gc = &sc->sc_gpio_gc;
 	gba.gba_pins = sc->sc_gpio_pins;
 	gba.gba_npins = NHGPIO_PINS;
-	config_found(self, &gba, gpiobus_print, CFARG_EOL);
+	config_found(self, &gba, gpiobus_print, CFARGS_NONE);
 #endif
+}
 static void
 nhgpio_pin_write(void *arg, int pin, int value)
+{
 	struct nhpow_softc *sc = arg;
 	int p;
 	KASSERT(sc != NULL);
 	p = pin % NHGPIO_PINS;
 	if (value)
 		sc->sc_gpio_wrstate |= (1 << p);

 @@ -1,14 +1,14 @@
-/* $NetBSD: zbbus.c,v 1.13 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: zbbus.c,v 1.13.8.1 2021/08/04 02:53:00 thorpej Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -23,27 +23,27 @@
  *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
  *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
  *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
  *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
  *    LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.13 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.13.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <mips/sibyte/include/zbbusvar.h>
 #include "locators.h"
 static int	zbbus_match(device_t, cfdata_t, void *);
 static void	zbbus_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(zbbus, 0,
 @@ -79,28 +79,27 @@ zbbus_attach(device_t parent, device_t s
+{
 	struct zbbus_attach_args za;
 	int i;
 	printf("\n");
 	zbbus_attached = 1;
 	sb1250_icu_init();
 	for (i = 0; i < sb1250_zbbus_dev_count; i++) {
 		memset(&za, 0, sizeof za);
 		za.za_locs = sb1250_zbbus_devs[i];
 		config_found(self, &za, zbbus_print,
-		    CFARG_SUBMATCH, zbbus_submatch,
+		    CFARGS(.submatch = zbbus_submatch));
 		    CFARG_EOL);
+	}
 	return;
+}
 int
 zbbus_print(void *aux, const char *pnp)
+{
 	struct zbbus_attach_args *zap = aux;
 	if (pnp)
 		aprint_normal("%s at %s",
 		    zbbus_entity_type_name(zap->za_locs.za_type), pnp);

 @@ -1,14 +1,14 @@
-/* $NetBSD: crmfb.c,v 1.48 2021/04/24 23:36:47 thorpej Exp $ */
+/* $NetBSD: crmfb.c,v 1.48.8.1 2021/08/04 02:53:00 thorpej Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  *               2008 Michael Lorenz <macallan@netbsd.org>
  * 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
 @@ -22,27 +22,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.
  */
 /*
  * SGI-CRM (O2) Framebuffer driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.48 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.48.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/vmparam.h>
 #include <dev/arcbios/arcbios.h>
 #include <dev/arcbios/arcbiosvar.h>
 @@ -405,27 +405,27 @@ crmfb_attach(device_t parent, device_t s
 	    ri->ri_devcmap[(defattr >> 16) & 0xff]);
 	consdev = arcbios_GetEnvironmentVariable("ConsoleOut");
 	if (consdev != NULL && strcmp(consdev, "video()") == 0) {
 		wsdisplay_cnattach(&crmfb_defaultscreen, ri, 0, 0, defattr);
 		vcons_replay_msgbuf(&crmfb_console_screen);
 		aa.console = 1;
 	} else
 		aa.console = 0;
 	aa.scrdata = &crmfb_screenlist;
 	aa.accessops = &crmfb_accessops;
 	aa.accesscookie = &sc->sc_vd;
-	config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &aa, wsemuldisplaydevprint, CFARGS_NONE);
 	sc->sc_cur_x = 0;
 	sc->sc_cur_y = 0;
 	sc->sc_hot_x = 0;
 	sc->sc_hot_y = 0;
 	return;
+}
 int
 crmfb_probe(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imc.c,v 1.36 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: imc.c,v 1.36.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2001 Rafal K. Boni
  * 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 @@
  * 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: imc.c,v 1.36 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.36.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 #include <sgimips/dev/imcreg.h>
 @@ -221,36 +221,34 @@ imc_attach(device_t parent, device_t sel
 				    IMC_GIO64ARB_EISAMST);
+			}
 			break;
+		}
+	}
 	bus_space_write_4(isc.iot, isc.ioh, IMC_GIO64ARB, reg);
 	if (isc.eisa_present) {
 #if notyet
 		memset(&iaa, 0, sizeof(iaa));
 		config_found(self, &iaa, eisabusprint,
-		    CFARG_IATTR, "eisabus",
+		    CFARGS(.iattr = "eisabus"));
 		    CFARG_EOL);
 #endif
+	}
 	memset(&iaa, 0, sizeof(iaa));
 	config_found(self, &iaa, imc_print,
-	    CFARG_IATTR, "giobus",
+	    CFARGS(.iattr = "giobus"));
 	    CFARG_EOL);
 	imc_watchdog_enable();
+}
 static int
 imc_print(void *aux, const char *name)
+{
 	if (name)
 		aprint_normal("gio at %s", name);
 	return UNCONF;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pic.c,v 1.18 2021/04/24 23:36:47 thorpej Exp $	 */
+/*	$NetBSD: pic.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $	 */
 /*
  * Copyright (c) 2002 Steve Rumble
  * 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 @@
  * 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: pic.c,v 1.18 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 #include <sgimips/dev/picreg.h>
 @@ -174,27 +174,27 @@ pic_attach(device_t parent, device_t sel
 	/* default gio32 delay time */
 	bus_space_write_4(psc.iot, psc.ioh, PIC_GIO32ARB_DELAY,
 			  PIC_GIO32ARB_DEFDELAY);
 	printf("\n");
 	platform.intr5 = pic_bus_error;
 	/*
 	 * A GIO bus exists on all IP12's. However, Personal Iris
 	 * machines use VME for their expansion bus.
 	 */
 	iaa.iaa_name = "gio";
-	(void)config_found(self, (void *)&iaa, pic_print, CFARG_EOL);
+	(void)config_found(self, (void *)&iaa, pic_print, CFARGS_NONE);
 	pic_watchdog_enable();
+}
 static int
 pic_print(void *aux, const char *name)
+{
 	struct pic_attach_args *iaa = aux;
 	if (name)
 		aprint_normal("%s at %s", iaa->iaa_name, name);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs.c,v 1.40 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.40.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gordon W. Ross and Wayne Knowles
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
  */
 /*
  * Zilog Z8530 Dual UART driver (machine-dependent part)
+ *
  * Runs two serial lines per chip using slave drivers.
  * Plain tty/async lines use the zs_async slave.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.40 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.40.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #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>
 @@ -305,27 +305,27 @@ zs_hpc_attach(device_t parent, device_t
 		/*
 		 * Clear the master interrupt enable.
 		 * The INTENA is common to both channels,
 		 * so just do it on the A channel.
 		 */
 		if (channel == 0) {
 			zs_write_reg(cs, 9, 0);
+		}
 		/*
 		 * Look for a child driver for this channel.
 		 * The child attach will setup the hardware.
 		 */
 		if (!config_found(self, (void *)&zsc_args, zs_print,
-		    CFARG_EOL)) {
+		    CFARGS_NONE)) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 				ZSWR9_A_RESET : ZSWR9_B_RESET;
 			s = splhigh();
 			zs_write_reg(cs, 9, reset);
 			splx(s);
+		}
+	}
 	zsc->sc_si = softint_establish(SOFTINT_SERIAL, zssoft, zsc);
 	cpu_intr_establish(haa->ha_irq, IPL_TTY, zshard, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs_kbd.c,v 1.12 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: zs_kbd.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2004 Steve Rumble
  * 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.
 @@ -23,27 +23,27 @@
  * 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.
  */
 /*
  * IP12/IP20 serial keyboard driver attached to zs channel 0 at 600bps.
  * This layer is the parent of wskbd.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.12 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wskbdvar.h>
 #include <dev/wscons/wsksymdef.h>
 #include <dev/wscons/wsksymvar.h>
 #include <dev/ic/z8530reg.h>
 @@ -238,27 +238,27 @@ zskbd_attach(device_t parent, device_t s
 	zs_set_speed(cs, ZSKBD_BAUD);
 	zs_loadchannelregs(cs);
 	/* request DIP switch settings just in case */
 	zskbd_ctrl(cs, ZSKBD_CTRL_A_RCB, 0, 0, 0);
 	splx(s);
 	/* attach wskbd */
 	wskaa.keymap =		&sgikbd_wskbd_keymapdata;
 	wskaa.accessops =	&zskbd_wskbd_accessops;
 	wskaa.accesscookie =	cs;
 	sc->sc_dc->wskbddev =	config_found(self, &wskaa, wskbddevprint,
-					     CFARG_EOL);
+					     CFARGS_NONE);
+}
 static void
 zskbd_rxint(struct zs_chanstate *cs)
+{
 	struct zskbd_softc     *sc;
 	struct zskbd_devconfig *dc;
 	uint8_t			c, r;
 	sc = cs->cs_private;
 	dc = sc->sc_dc;
 	/* clear errors */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zs_ms.c,v 1.9 2021/04/24 23:36:47 thorpej Exp $	*/
+/*	$NetBSD: zs_ms.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2004 Steve Rumble
  * 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 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * IP12/IP20 serial mouse driver attached to zs channel 1 at 4800bps.
  * This layer feeds wsmouse.
+ *
  * 5 byte packets: sync, x1, y1, x2, y2
  * sync format: binary 10000LMR (left, middle, right) 0 is down
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ms.c,v 1.9 2021/04/24 23:36:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ms.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 #include <dev/ic/z8530reg.h>
 #include <machine/machtype.h>
 #include <machine/z8530var.h>
 @@ -161,27 +161,27 @@ zsms_attach(device_t parent, device_t se
 	aprint_normal(": baud rate %d\n", ZSMS_BAUD);
 	s = splzs();
 	zs_write_reg(cs, 9, (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET);
 	cs->cs_preg[1] = ZSWR1_RIE;
 	zs_set_speed(cs, ZSMS_BAUD);
 	zs_loadchannelregs(cs);
 	splx(s);
 	/* attach wsmouse */
 	wsmaa.accessops =	&zsms_wsmouse_accessops;
 	wsmaa.accesscookie =	sc;
 	sc->wsmousedev =	config_found(self, &wsmaa, wsmousedevprint,
-					     CFARG_EOL);
+					     CFARGS_NONE);
+}
 void
 zsms_rxint(struct zs_chanstate *cs)
+{
 	uint8_t c, r;
 	struct zsms_softc *sc = cs->cs_private;
 	/* clear errors */
 	r = zs_read_reg(cs, 1);
 	if (r & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE))
 		zs_write_csr(cs, ZSWR0_RESET_ERRORS);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: gio.c,v 1.37 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: gio.c,v 1.37.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 Soren S. Jorvang
  * 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.
 @@ -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: gio.c,v 1.37 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.37.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 #include <sgimips/gio/gioreg.h>
 #include <sgimips/gio/giovar.h>
 @@ -210,28 +210,27 @@ gio_attach(device_t parent, device_t sel
 		/* XXX */
 		if (platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga.ga_addr),
 		    sizeof(uint32_t)))
 			continue;
 		ga.ga_iot = normal_memt;
 		if (bus_space_map(normal_memt, ga.ga_addr, 0,
 		    BUS_SPACE_MAP_LINEAR, &ga.ga_ioh) != 0)
 		    	continue;
 		ga.ga_dmat = &sgimips_default_bus_dma_tag;
 		ga.ga_product = -1;
 		if (config_found(self, &ga, gio_print,
-				 CFARG_SUBMATCH, gio_submatch,
+				 CFARGS(.submatch = gio_submatch)) != NULL) {
 				 CFARG_EOL) != NULL) {
 			if (ngfx == MAXGFX)
 				panic("gio_attach: MAXGFX");
 			gfx[ngfx++] = gfx_bases[i].base;
+		}
+	}
 	/*
 	 * Now attach any GIO expansion cards.
+	 *
 	 * Be sure to skip any addresses to which a graphics device has
 	 * already been attached.
 	 */
 	for (i = 0; slot_bases[i].base != 0; i++) {
 @@ -259,33 +258,31 @@ gio_attach(device_t parent, device_t sel
 		/* XXX */
 		if (platform.badaddr((void *)MIPS_PHYS_TO_KSEG1(ga.ga_addr),
 		    sizeof(uint32_t)))
 			continue;
 		ga.ga_iot = normal_memt;
 		if (bus_space_map(normal_memt, ga.ga_addr, 0,
 		    BUS_SPACE_MAP_LINEAR, &ga.ga_ioh) != 0)
 		    	continue;
 		ga.ga_dmat = &sgimips_default_bus_dma_tag;
 		ga.ga_product = bus_space_read_4(ga.ga_iot, ga.ga_ioh, 0);
 		config_found(self, &ga, gio_print,
-		    CFARG_SUBMATCH, gio_submatch,
+		    CFARGS(.submatch = gio_submatch));
 		    CFARG_EOL);
+	}
 	config_search(self, &ga,
-	    CFARG_SEARCH, gio_search,
+	    CFARGS(.search = gio_search));
 	    CFARG_EOL);
+}
 static int
 gio_print(void *aux, const char *pnp)
+{
 	struct gio_attach_args *ga = aux;
 	int i = 0;
 	/* gfx probe */
 	if (ga->ga_product == -1)
 		return (QUIET);
 	if (pnp != NULL) {
 @@ -327,27 +324,27 @@ gio_search(device_t parent, cfdata_t cf,
 	struct gio_attach_args *ga = aux;
 	do {
 		/* Handled by direct configuration, so skip here */
 		if (cf->cf_loc[GIOCF_ADDR] == GIOCF_ADDR_DEFAULT)
 			return 0;
 		ga->ga_slot = cf->cf_loc[GIOCF_SLOT];
 		ga->ga_addr = cf->cf_loc[GIOCF_ADDR];
 		ga->ga_iot = normal_memt;
 		ga->ga_ioh = MIPS_PHYS_TO_KSEG1(ga->ga_addr);
 		if (config_probe(parent, cf, ga))
-			config_attach(parent, cf, ga, gio_print, CFARG_EOL);
+			config_attach(parent, cf, ga, gio_print, CFARGS_NONE);
 	} while (cf->cf_fstate == FSTATE_STAR);
 	return 0;
+}
 static int
 gio_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct gio_attach_args *ga = aux;
 	if (cf->cf_loc[GIOCF_SLOT] != GIOCF_SLOT_DEFAULT &&
 	    cf->cf_loc[GIOCF_SLOT] != ga->ga_slot)
 		return 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: grtwo.c,v 1.17 2021/04/24 23:36:48 thorpej Exp $	 */
+/* $NetBSD: grtwo.c,v 1.17.8.1 2021/08/04 02:53:00 thorpej Exp $	 */
 /*
  * Copyright (c) 2004 Christopher SEKIYA
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
+ *
  * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
  */
 /* wscons driver for SGI GR2 family of framebuffers
+ *
  * Heavily based on the newport wscons driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.17 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grtwo.c,v 1.17.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <machine/sysconf.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wsfont/wsfont.h>
 #include <sgimips/gio/giovar.h>
 @@ -518,27 +518,27 @@ grtwo_attach(device_t parent, device_t s
 	aprint_normal(": GR2 (board rev %x, monitor %d, depth %d)\n",
 	      sc->sc_dc->boardrev, sc->sc_dc->monitor, sc->sc_dc->depth);
 	wa.scrdata = &grtwo_screenlist;
 	wa.accessops = &grtwo_accessops;
 	wa.accesscookie = sc->sc_dc;
         if ((cpu_intr_establish(0, IPL_TTY, grtwo_intr0, sc)) == NULL)
                 printf(": unable to establish interrupt!\n");
         if ((cpu_intr_establish(6, IPL_TTY, grtwo_intr6, sc)) == NULL)
                 printf(": unable to establish interrupt!\n");
-	config_found(self, &wa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &wa, wsemuldisplaydevprint, CFARGS_NONE);
+}
 int
 grtwo_cnattach(struct gio_attach_args * ga)
+{
 	long            defattr = GR2_ATTR_ENCODE(WSCOL_WHITE, WSCOL_BLACK);
 	if (!grtwo_match(NULL, NULL, ga)) {
 		return ENXIO;
+	}
 	grtwo_attach_common(&grtwo_console_dc, ga);
 	wsdisplay_cnattach(&grtwo_screen, &grtwo_console_dc, 0, 0, defattr);

 @@ -1,14 +1,14 @@
-/*	$Id: light.c,v 1.9 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$Id: light.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2006 Stephen M. Rumble
  * Copyright (c) 2003 Ilpo Ruotsalainen
  * 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
 @@ -33,27 +33,27 @@
 /*
  * SGI "Light" graphics, a.k.a. "Entry", "Starter", "LG1", and "LG2".
+ *
  * 1024x768 8bpp at 60Hz.
+ *
  * This driver supports the boards found in Indigo R3k and R4k machines.
  * There is a Crimson variant, but the register offsets differ significantly.
+ *
  * Light's REX chip is the precursor of the REX3 found in "newport", hence
  * much similarity exists.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.9 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: light.c,v 1.9.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <machine/sysconf.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wsfont/wsfont.h>
 #include <sgimips/gio/giovar.h>
 @@ -326,27 +326,27 @@ light_attach(device_t parent, device_t s
 		light_attach_common(sc->sc_dc, ga);
+	}
 	aprint_naive(": Display adapter\n");
 	aprint_normal(": SGI LG%d (board revision %d)\n",
 	    LIGHT_IS_LG1(sc->sc_dc->dc_boardrev) ? 1 : 2,
 	    sc->sc_dc->dc_boardrev);
 	wa.scrdata = &light_screenlist;
 	wa.accessops = &light_accessops;
 	wa.accesscookie = sc->sc_dc;
-	config_found(self, &wa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(self, &wa, wsemuldisplaydevprint, CFARGS_NONE);
+}
 int
 light_cnattach(struct gio_attach_args *ga)
+{
 	if (!light_match(NULL, NULL, ga))
 		return (ENXIO);
 	light_attach_common(&light_console_dc, ga);
 	wsdisplay_cnattach(&light_screen, &light_console_dc, 0, 0,
 	    LIGHT_ATTR_ENCODE(WSCOL_WHITE, WSCOL_BLACK));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: newport.c,v 1.22 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: newport.c,v 1.22.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Ilpo Ruotsalainen
  *               2009 Michael Lorenz
  * 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
 @@ -21,27 +21,27 @@
  * 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.
+ *
  * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.22 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: newport.c,v 1.22.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <machine/sysconf.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 @@ -629,27 +629,27 @@ newport_attach(device_t parent, device_t
 	sc->sc_dc->dc_vd.init_screen = newport_init_screen;
 	if (newport_is_console) {
 		newport_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
 		vcons_init_screen(&sc->sc_dc->dc_vd, &newport_console_screen,
 , &defattr);
 		sc->sc_dc->dc_screen->textops =
 		    &newport_console_screen.scr_ri.ri_ops;
 		vcons_replay_msgbuf(&newport_console_screen);
+	}
 	wa.scrdata = &newport_screenlist;
 	wa.accessops = &newport_accessops;
 	wa.accesscookie = &sc->sc_dc->dc_vd;
-	config_found(sc->sc_dev, &wa, wsemuldisplaydevprint, CFARG_EOL);
+	config_found(sc->sc_dev, &wa, wsemuldisplaydevprint, CFARGS_NONE);
+}
 int
 newport_cnattach(struct gio_attach_args *ga)
+{
 	struct rasops_info *ri = &newport_console_screen.scr_ri;
 	long defattr = 0x000f0000;
 	if (!newport_match(NULL, NULL, ga)) {
 		return ENXIO;
+	}
 	newport_attach_common(&newport_console_dc, ga);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: pci_gio.c,v 1.18 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: pci_gio.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2006 Stephen M. Rumble
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * 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: pci_gio.c,v 1.18 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.18.8.1 2021/08/04 02:53:00 thorpej Exp $");
 /*
  * Glue for PCI devices that are connected to the GIO bus by various little
  * GIO<->PCI ASICs.
+ *
  * We presently support the following boards:
  *	o Phobos G100/G130/G160	(if_tlp, lxtphy)
  *	o Set Engineering GFE	(if_tl, nsphy)
  */
 #include "opt_pci.h"
 #include "pci.h"
 @@ -227,27 +227,27 @@ giopci_attach(device_t parent, device_t
 	pci_configure_bus(pc, pcires, 0,
 	    mips_cache_info.mci_dcache_align);
 	pciconf_resource_fini(pcires);
 #endif
 	memset(&pba, 0, sizeof(pba));
 	pba.pba_memt	= gio_pci_memt;
 	pba.pba_dmat	= ga->ga_dmat;
 	pba.pba_pc	= pc;
 	pba.pba_flags	= PCI_FLAGS_MEM_OKAY;
 	/* NB: do not set PCI_FLAGS_{MRL,MRM,MWI}_OKAY  -- true ?! */
-	config_found(self, &pba, pcibusprint, CFARG_EOL);
+	config_found(self, &pba, pcibusprint, CFARGS_NONE);
+}
 static int
 giopci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{
 	return (busno == 0);
+}
 static pcireg_t
 giopci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
+{
 	struct giopci_softc *sc = pc->cookie;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hpc.c,v 1.72 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: hpc.c,v 1.72.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 Soren S. Jorvang
  * Copyright (c) 2001 Rafal K. Boni
  * Copyright (c) 2001 Jason R. Thorpe
  * 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
 @@ -25,27 +25,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: hpc.c,v 1.72 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.72.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/callout.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 #include <sgimips/gio/gioreg.h>
 @@ -527,32 +527,30 @@ hpc_attach(device_t parent, device_t sel
 		if (bus_space_map(normal_memt, sc->sc_base, 0,
 		    BUS_SPACE_MAP_LINEAR, &ha.ha_sh) != 0)
 		    	continue;
 		ha.ha_dmat = &sgimips_default_bus_dma_tag;
 		if (hpctype == 3)
 			ha.hpc_regs = &hpc3_values;
 		else
 			ha.hpc_regs = &hpc1_values;
 		ha.hpc_regs->revision = hpctype;
 		/* XXXgross! avoid complaining in E++ and GIO32 SCSI cases */
 		if (hpctype != 3 && sc->sc_base != HPC_BASE_ADDRESS_0) {
 			config_found(self, &ha, NULL,
-			    CFARG_SUBMATCH, hpc_submatch,
+			    CFARGS(.submatch = hpc_submatch));
 			    CFARG_EOL);
 		} else {
 			config_found(self, &ha, hpc_print,
-			    CFARG_SUBMATCH, hpc_submatch,
+			    CFARGS(.submatch = hpc_submatch));
 			    CFARG_EOL);
+		}
+	}
 #if defined(BLINK)
 	if (mach_type == MACH_SGI_IP12 || mach_type == MACH_SGI_IP20)
 		hpc_blink(sc);
 #endif
+}
 /*
  * HPC revision detection isn't as simple as it should be. Devices probe
  * differently depending on their slots, but luckily there is only one
  * instance in which we have to decide the major revision (HPC1 vs HPC3).

 @@ -1,14 +1,14 @@
-/* $NetBSD: pi1ppc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $ */
+/* $NetBSD: pi1ppc.c,v 1.14.8.1 2021/08/04 02:53:00 thorpej Exp $ */
 /*
  * Copyright (c) 2001 Alcove - Nicolas Souchu
  * Copyright (c) 2003, 2004 Gary Thorpe <gathorpe@users.sourceforge.net>
  * Copyright (c) 2005 Joe Britt <britt@danger.com> - SGI PI1 version
  * 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.
 @@ -23,27 +23,27 @@
  * 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.
+ *
  * FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1.14.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include "opt_pi1ppc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 /*#include <machine/intr.h>*/
 @@ -271,27 +271,27 @@ pi1ppc_sc_attach(struct pi1ppc_softc *ls
 	/* Initialize handler list, may be added to by grandchildren */
 	SLIST_INIT(&(lsc->sc_handler_listhead));
 	/* Initialize interrupt state */
 	lsc->sc_irqstat = PI1PPC_IRQ_NONE;
 	lsc->sc_ecr_intr = lsc->sc_ctr_intr = lsc->sc_str_intr = 0;
 	/* Disable DMA/interrupts (each ppbus driver selects usage itself) */
 	lsc->sc_use = 0;
 	/* Configure child of the device. */
 	lsc->child = config_found(lsc->sc_dev, &(sc_parport_adapter),
-		pi1ppc_print, CFARG_EOL);
+		pi1ppc_print, CFARGS_NONE);
 	return;
+}
 /* Soft configuration detach */
 int
 pi1ppc_sc_detach(struct pi1ppc_softc *lsc, int flag)
+{
 	device_t dev = lsc->sc_dev;
 	/* Detach children devices */
 	if (config_detach(lsc->child, flag) && !(flag & DETACH_QUIET)) {
 		printf("%s not able to detach child device, ", device_xname(dev));

 @@ -1,14 +1,14 @@
-/* $NetBSD: ioc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $	 */
+/* $NetBSD: ioc.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $	 */
 /*
  * Copyright (c) 2003 Christopher Sekiya
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
  */
 /*
  * ip20/22/24 I/O Controller (IOC)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.12.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <uvm/uvm_extern.h>
 @@ -148,28 +148,27 @@ ioc_attach(device_t parent, device_t sel
 #if defined(BLINK)
 	ioc_blink(sc);
 #endif
 #if defined(notyet)
 	/*
 	 * pckbc, zstty, and lpt should attach under the IOC.  This begs the
 	 * question of how we sort things out with ip20, which has no IOC.
 	 * For now, we pretend that everything attaches at HPC and ignore
 	 * the IOC.
 	 */
 	config_search(self, NULL,
-	    CFARG_SEARCH, ioc_search,
+	    CFARGS(.search = ioc_search));
 	    CFARG_EOL);
 #endif
+}
 #if defined(notyet)
 static int
 ioc_print(void *aux, const char *pnp)
+{
 	struct ioc_attach_args *iaa = aux;
 	if (pnp != 0)
 		return QUIET;
 	if (iaa->iaa_offset != IOCCF_OFFSET_DEFAULT)
 @@ -185,27 +184,27 @@ ioc_search(device_t parent, cfdata_t cf,
+{
 	struct ioc_softc *sc = device_private(parent);
 	struct ioc_attach_args iaa;
 	int             tryagain;
 	do {
 		iaa.iaa_offset = cf->cf_loc[IOCCF_OFFSET];
 		iaa.iaa_intr = cf->cf_loc[IOCCF_INTR];
 		iaa.iaa_st = normal_memt;
 		iaa.iaa_sh = sc->sc_ioh;	/* XXX */
 		tryagain = 0;
 		if (config_probe(parent, cf, &iaa)) {
-			config_attach(parent, cf, &iaa, ioc_print, CFARG_EOL);
+			config_attach(parent, cf, &iaa, ioc_print, CFARGS_NONE);
 			tryagain = (cf->cf_fstate == FSTATE_STAR);
+		}
 	} while (tryagain);
 	return 0;
+}
 #endif
 #if defined(BLINK)
 static void
 ioc_blink(void *self)
+{
 	struct ioc_softc *sc = device_private(self);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: oioc.c,v 1.5 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: oioc.c,v 1.5.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2009 Stephen M. Rumble
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -27,27 +27,27 @@
 /*
  * IOC1/IOC2 chips on IP4 and IP6/IP10 machines. This interfaces the SCSI
  * and Ethernet controllers, performs DMA for the former, and does address
  * space translation for the latter (maps the lance memory space to physical
  * pages).
+ *
  * 'I/O Controller' is a sufficiently generic name that SGI created another
  * one for IP24, which basically stuffed a bunch of miscellany on an ASIC.
  * So, we'll call ourselves 'Old IOC' and hope that there wasn't an even older
  * one.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.5 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.5.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <sys/bus.h>
 #include <machine/machtype.h>
 #include <machine/sysconf.h>
 #include <sgimips/ioc/oiocreg.h>
 #include <sgimips/ioc/oiocvar.h>
 @@ -138,27 +138,27 @@ oioc_attach(device_t parent, device_t se
 	printf("oioc0: Burst DMA %ssupported\n",
 	    (sc->sc_burst_dma) ? "" : "not ");
 	for (i = 0; oioc_devices[i].od_name != NULL; i++) {
 		struct oioc_attach_args oa;
 		oa.oa_name      = oioc_devices[i].od_name;
 		oa.oa_irq       = oioc_devices[i].od_irq;
 		oa.oa_burst_dma = sc->sc_burst_dma;
 		oa.oa_st        = normal_memt;
 		oa.oa_sh        = sc->sc_ioh;
 		oa.oa_dmat      = &sgimips_default_bus_dma_tag;
-		config_found(self, &oa, oioc_print, CFARG_EOL);
+		config_found(self, &oa, oioc_print, CFARGS_NONE);
+	}
+}
 static int
 oioc_print(void *aux, const char *pnp)
+{
 	struct oioc_attach_args *oa = aux;
 	if (pnp)
 		printf("%s at %s", oa->oa_name, pnp);
 	return (UNCONF);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2003 Christopher Sekiya
  * Copyright (c) 2002,2003 Rafal K. Boni
  * Copyright (c) 2000 Soren S. Jorvang
  * 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
 @@ -35,27 +35,27 @@
  */
 /*
  * O2 MACE
+ *
  * The MACE is weird -- although it is a 32-bit device, writes only seem to
  * work properly if they are 64-bit-at-once writes (at least, out in ISA
  * space and probably MEC space -- the PCI stuff seems to be okay with _4).
  * Therefore, the _8* routines are used even though the top 32 bits are
  * thrown away.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 @@ -187,28 +187,27 @@ mace_attach(device_t parent, device_t se
 	bus_space_write_8(sc->iot, sc->ioh, MACE_ISA_FLASH_NIC_REG, scratch);
 #if defined(BLINK)
 	mace_blink(sc);
 #endif
 	/* Initialize the maceintr elements to sane values */
 	for (scratch = 0; scratch < MACE_NINTR; scratch++) {
 		maceintrtab[scratch].func = NULL;
 		maceintrtab[scratch].irq = 0;
+	}
 	config_search(self, NULL,
-	    CFARG_SEARCH, mace_search,
+	    CFARGS(.search = mace_search));
 	    CFARG_EOL);
+}
 static int
 mace_print(void *aux, const char *pnp)
+{
 	struct mace_attach_args *maa = aux;
 	if (pnp != 0)
 		return QUIET;
 	if (maa->maa_offset != MACECF_OFFSET_DEFAULT)
 		aprint_normal(" offset 0x%lx", maa->maa_offset);
 @@ -228,27 +227,27 @@ mace_search(device_t parent, struct cfda
 	int tryagain;
 	do {
 		maa.maa_offset = cf->cf_loc[MACECF_OFFSET];
 		maa.maa_intr = cf->cf_loc[MACECF_INTR];
 		maa.maa_intrmask = cf->cf_loc[MACECF_INTRMASK];
 		maa.maa_st = normal_memt;
 		maa.maa_sh = sc->ioh;	/* XXX */
 		maa.maa_dmat = &sgimips_default_bus_dma_tag;
 		maa.isa_ringbuffer = sc->isa_ringbuffer;
 		tryagain = 0;
 		if (config_probe(parent, cf, &maa)) {
-			config_attach(parent, cf, &maa, mace_print, CFARG_EOL);
+			config_attach(parent, cf, &maa, mace_print, CFARGS_NONE);
 			tryagain = (cf->cf_fstate == FSTATE_STAR);
+		}
 	} while (tryagain);
 	return 0;
+}
 void *
 mace_intr_establish(int intr, int level, int (*func)(void *), void *arg)
+{
 	int i;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: pci_mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2001,2003 Christopher Sekiya
  * Copyright (c) 2000 Soren S. Jorvang
  * 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
 @@ -24,27 +24,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: pci_mace.c,v 1.24 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.24.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #include <machine/locore.h>
 #include <machine/autoconf.h>
 #include <machine/vmparam.h>
 #include <sys/bus.h>
 @@ -195,27 +195,27 @@ macepci_attach(device_t parent, device_t
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 	    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY | PCI_FLAGS_MWI_OKAY;
 	pba.pba_pc = pc;
 #ifdef MACEPCI_IO_WAS_BUGGY
 	if (rev == 0)
 		pba.pba_flags &= ~PCI_FLAGS_IO_OKAY;		/* Buggy? */
 #endif
 	cpu_intr_establish(maa->maa_intr, IPL_NONE, macepci_intr, sc);
-	config_found(self, &pba, pcibusprint, CFARG_EOL);
+	config_found(self, &pba, pcibusprint, CFARGS_NONE);
 #endif
+}
 int
 macepci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{
 	if (busno == 0)
 		return 5;	/* 2 on-board SCSI chips, slots 0, 1 and 2 */
 	else
 		return 0;	/* XXX */
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:53:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 Soren S. Jorvang
  * 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.
 @@ -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: mainbus.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:53:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <mips/cpuregs.h>
 #include <machine/autoconf.h>
 #include <machine/machtype.h>
 #include <dev/arcbios/arcbios.h>
 #include <dev/arcbios/arcbiosvar.h>
 @@ -64,42 +64,41 @@ mainbus_match(device_t parent, cfdata_t
+}
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct mainbus_attach_args ma;
 	aprint_normal(": %s [%s, %s], %d processor%s\n",
 	    arcbios_system_identifier,
 	    arcbios_sysid_vendor, arcbios_sysid_product,
 	    ncpus, ncpus == 1 ? "" : "s");
 	config_search(self, &ma,
-	    CFARG_SEARCH, mainbus_search,
+	    CFARGS(.search = mainbus_search));
 	    CFARG_EOL);
+}
 static int
 mainbus_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	do {
 		ma->ma_name = NULL;
 		ma->ma_addr = cf->cf_loc[MAINBUSCF_ADDR];
 		ma->ma_iot = 0;
 		ma->ma_ioh = MIPS_PHYS_TO_KSEG1(ma->ma_addr);
 		if (config_probe(parent, cf, ma))
-			config_attach(parent, cf, ma, mainbus_print, CFARG_EOL);
+			config_attach(parent, cf, ma, mainbus_print, CFARGS_NONE);
 	} while (cf->cf_fstate == FSTATE_STAR);
 	return 0;
+}
 int
 mainbus_print(void *aux, const char *pnp)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (pnp != 0)
 		return QUIET;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: adc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $ */
+/*	$NetBSD: adc.c,v 1.14.8.1 2021/08/04 02:53:01 thorpej Exp $ */
 /*
  * Copyright (c) 2003 Valeriy E. Ushakov
  * 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 @@
  * 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: adc.c,v 1.14 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.14.8.1 2021/08/04 02:53:01 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sh3/adcreg.h>
 #include <sh3/dev/adcvar.h>
 #define ADC_(x)    (*((volatile uint8_t *)SH7709_AD ## x))
 @@ -70,46 +70,45 @@ adc_match(device_t parent, cfdata_t cf,
 static void
 adc_attach(device_t parent, device_t self, void *aux)
+{
 	ADC_(CSR) = 0;
 	ADC_(CR) = 0;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	config_search(self, NULL,
-	    CFARG_SEARCH, adc_search,
+	    CFARGS(.search = adc_search));
 	    CFARG_EOL);
 	/*
 	 * XXX: TODO: provide hooks to manage power.  For now register
 	 * null hooks which is no worse than before.
+	 *
 	 * NB: ADC registers are reset by standby!
 	 */
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "unable to establish power handler\n");
+}
 static int
 adc_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	if (config_probe(parent, cf, NULL))
-		config_attach(parent, cf, NULL, adc_print, CFARG_EOL);
+		config_attach(parent, cf, NULL, adc_print, CFARGS_NONE);
 	return (0);
+}
 static int
 adc_print(void *aux, const char *pnp)
+{
 	return (pnp ? QUIET : UNCONF);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shb.c,v 1.15 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: shb.c,v 1.15.8.1 2021/08/04 02:53:01 thorpej Exp $	*/
 /*-
  * Copyright (c) 2002 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.
 @@ -17,27 +17,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: shb.c,v 1.15 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shb.c,v 1.15.8.1 2021/08/04 02:53:01 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 extern struct cfdriver shb_cd;
 static int shb_match(device_t, cfdata_t, void *);
 static void shb_attach(device_t, device_t, void *);
 static int shb_print(void *, const char *);
 static int shb_search(device_t, cfdata_t, const int *, void *);
 @@ -55,40 +55,39 @@ shb_match(device_t parent, cfdata_t cf,
 		return (0);
 	return (1);
+}
 static void
 shb_attach(device_t parent, device_t self, void *aux)
+{
 	aprint_naive("\n");
 	aprint_normal("\n");
 	config_search(self, NULL,
-	    CFARG_SEARCH, shb_search,
+	    CFARGS(.search = shb_search));
 	    CFARG_EOL);
 	/*
 	 * XXX: TODO: provide hooks to manage on-chip modules.  For
 	 * now register null hooks which is no worse than before.
 	 */
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "unable to establish power handler\n");
+}
 static int
 shb_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+{
 	if (config_probe(parent, cf, NULL))
-		config_attach(parent, cf, NULL, shb_print, CFARG_EOL);
+		config_attach(parent, cf, NULL, shb_print, CFARGS_NONE);
 	return (0);
+}
 static int
 shb_print(void *aux, const char *pnp)
+{
 	return (pnp ? QUIET : UNCONF);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shpcic.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $	*/
+/*	$NetBSD: shpcic.c,v 1.21.8.1 2021/08/04 02:53:01 thorpej Exp $	*/
 /*-
  * Copyright (C) 2005 NONAKA Kimihiro <nonaka@netbsd.org>
  * 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.
 @@ -16,27 +16,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: shpcic.c,v 1.21 2021/04/24 23:36:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.21.8.1 2021/08/04 02:53:01 thorpej Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 #include <dev/pci/pcidevs.h>
 @@ -234,27 +234,27 @@ shpcic_attach(device_t parent, device_t
 	pciconf_resource_fini(pcires);
 #endif
 	/* PCI bus */
 	memset(&pba, 0, sizeof(pba));
 	pba.pba_iot = shpcic_get_bus_io_tag();
 	pba.pba_memt = shpcic_get_bus_mem_tag();
 	pba.pba_dmat = shpcic_get_bus_dma_tag();
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = NULL;
 	pba.pba_bus = 0;
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
-	config_found(self, &pba, NULL, CFARG_EOL);
+	config_found(self, &pba, NULL, CFARGS_NONE);
+}
 int
 shpcic_bus_maxdevs(void *v, int busno)
+{
 	/*
 	 * Bus number is irrelevant.  Configuration Mechanism 1 is in
 	 * use, can have devices 0-32 (i.e. the `normal' range).
 	 */
 	return (32);
+}