 @@ -1,14 +1,14 @@
-/*	$NetBSD: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $	*/
 /*	NetBSD: mainbus.c,v 1.104 2018/12/02 08:19:44 cherry 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.
 @@ -22,27 +22,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: i386_mainbus.c,v 1.5 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_mainbus.c,v 1.5.8.1 2021/08/04 01:21:26 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/eisa/eisavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/isa/isareg.h>		/* for ISA_HOLE_VADDR */
 @@ -220,38 +220,36 @@ i386_mainbus_attach(device_t parent, dev
 	i386_mainbus_rescan(self, "pcibus", NULL);
 	i386_mainbus_rescan(self, "mcabus", NULL);
 	if (memcmp(ISA_HOLE_VADDR(EISA_ID_PADDR), EISA_ID, EISA_ID_LEN) == 0 &&
 	    eisa_has_been_seen == 0) {
 		mba.mba_eba.eba_iot = x86_bus_space_io;
 		mba.mba_eba.eba_memt = x86_bus_space_mem;
 #if NEISA > 0
 		mba.mba_eba.eba_dmat = &eisa_bus_dma_tag;
 #endif
 		config_found(self, &mba.mba_eba, eisabusprint,
-		    CFARG_IATTR, "eisabus",
+		    CFARGS(.iattr = "eisabus"));
 		    CFARG_EOL);
+	}
 #if NISA > 0
 	if (isa_has_been_seen == 0) {
 		mba.mba_iba = mba_iba;
 		mba.mba_iba.iba_iot = x86_bus_space_io;
 		mba.mba_iba.iba_memt = x86_bus_space_mem;
 		config_found(self, &mba.mba_iba, isabusprint,
-		    CFARG_IATTR, "isabus",
+		    CFARGS(.iattr = "isabus"));
 		    CFARG_EOL);
+	}
 #endif
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 /* scan for new children */
 int
 i386_mainbus_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct mainbus_softc *sc = device_private(self);
 #if NACPICA > 0 || NIPMI > 0 || NMCA > 0 || NPCI > 0 || NPNPBIOS > 0
 @@ -262,63 +260,60 @@ i386_mainbus_rescan(device_t self, const
 	    acpi_present) {
 #if NACPICA > 0
 		mba.mba_acpi.aa_iot = x86_bus_space_io;
 		mba.mba_acpi.aa_memt = x86_bus_space_mem;
 		mba.mba_acpi.aa_pc = NULL;
 		mba.mba_acpi.aa_pciflags =
 		    PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY |
 		    PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
 		    PCI_FLAGS_MWI_OKAY;
 		mba.mba_acpi.aa_ic = &x86_isa_chipset;
 		mba.mba_acpi.aa_dmat = &pci_bus_dma_tag;
 		mba.mba_acpi.aa_dmat64 = NULL;
 		sc->sc_acpi = config_found(self, &mba.mba_acpi, NULL,
-		    CFARG_IATTR, "acpibus",
+		    CFARGS(.iattr = "acpibus"));
 		    CFARG_EOL);
 #if 0 /* XXXJRT not yet */
 		if (acpi_active) {
 			/*
 			 * ACPI already did all the work for us, there
 			 * is nothing more for us to do.
 			 */
 			return;
+		}
 #endif
 #endif
+	}
 	if (ifattr_match(ifattr, "pnpbiosbus") && sc->sc_pnpbios == NULL) {
 #if NPNPBIOS > 0
 #if NACPICA > 0
 		if (acpi_active == 0)
 #endif
 		if (pnpbios_probe()) {
 			mba.mba_paa.paa_ic = &x86_isa_chipset;
 			sc->sc_pnpbios = config_found(self, &mba.mba_paa, NULL,
-			    CFARG_IATTR, "pnpbiosbus",
+			    CFARGS(.iattr = "pnpbiosbus"));
 			    CFARG_EOL);
+		}
 #endif
+	}
 	if (ifattr_match(ifattr, "ipmibus") && sc->sc_ipmi == NULL) {
 #if NIPMI > 0
 		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)) {
 			sc->sc_ipmi = config_found(self, &mba.mba_ipmi, NULL,
-			    CFARG_IATTR, "ipmibus",
+			    CFARGS(.iattr = "ipmibus"));
 			    CFARG_EOL);
+		}
 #endif
+	}
 	/*
 	 * 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 (pci_mode_detect() != 0 && ifattr_match(ifattr, "pcibus")) {
 		int npcibus = 0;
 @@ -342,43 +337,41 @@ i386_mainbus_rescan(device_t self, const
 		mba.mba_pba.pba_sub = 255;
 		mba.mba_pba.pba_bridgetag = NULL;
 #if NACPICA > 0 && defined(ACPI_SCANPCI)
 		if (npcibus == 0 && mpacpi_active)
 			npcibus = mp_pci_scan(self, &mba.mba_pba, pcibusprint);
 #endif
 #if defined(MPBIOS) && defined(MPBIOS_SCANPCI)
 		if (npcibus == 0 && mpbios_scanned != 0)
 			npcibus = mp_pci_scan(self, &mba.mba_pba, pcibusprint);
 #endif
 		if (npcibus == 0 && sc->sc_pci == NULL) {
 			sc->sc_pci =
 			    config_found(self, &mba.mba_pba, pcibusprint,
-			    CFARG_IATTR, "pcibus",
+					 CFARGS(.iattr = "pcibus"));
 			    CFARG_EOL);
+		}
 #if NACPICA > 0
 		if (mp_verbose)
 			acpi_pci_link_state();
 #endif
+	}
 #endif
 	if (ifattr_match(ifattr, "mcabus") && sc->sc_mca == NULL) {
 #if NMCA > 0
 	/* Note: MCA bus probe is done in i386/machdep.c */
 		if (MCA_system) {
 			mba.mba_mba.mba_iot = x86_bus_space_io;
 			mba.mba_mba.mba_memt = x86_bus_space_mem;
 			mba.mba_mba.mba_dmat = &mca_bus_dma_tag;
 			mba.mba_mba.mba_mc = NULL;
 			mba.mba_mba.mba_bus = 0;
 			sc->sc_mca = config_found(self,
 			    &mba.mba_mba, mcabusprint,
-			    CFARG_IATTR, "mcabus",
+			    CFARGS(.iattr = "mcabus"));
 			    CFARG_EOL);
+		}
 #endif
+	}
 	return 0;
+}

 @@ -1,40 +1,40 @@
-/*	$NetBSD: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
  * Copyright (c) 1992, 1993 Erik Forsberg.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY ``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 I 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: lms.c,v 1.57 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.57.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <machine/intr.h>
 #include <dev/isa/isavar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -156,27 +156,27 @@ lmsattach(device_t parent, device_t self
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
 	    IST_PULSE, IPL_TTY, lmsintr, sc);
 	a.accessops = &lms_accessops;
 	a.accesscookie = sc;
 	/*
 	 * Attach the wsmouse, saving a handle to it.
 	 * Note that we don't need to check this pointer against NULL
 	 * here or in psmintr, because if this fails lms_enable() will
 	 * never be called, so lmsintr() will never be called.
 	 */
-	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
+}
 static int
 lms_enable(void *v)
+{
 	struct lms_softc *sc = v;
 	if (sc->sc_enabled)
 		return EBUSY;
 	sc->sc_enabled = 1;
 	sc->oldbuttons = 0;

 @@ -1,40 +1,40 @@
-/*	$NetBSD: mms.c,v 1.54 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: mms.c,v 1.54.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 /*-
  * Copyright (c) 1993, 1994 Charles M. Hannum.
  * Copyright (c) 1992, 1993 Erik Forsberg.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY ``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 I 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: mms.c,v 1.54 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.54.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <dev/isa/isavar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsmousevar.h>
 @@ -147,27 +147,27 @@ mmsattach(device_t parent, device_t self
 	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq[0].ir_irq,
 	    IST_PULSE, IPL_TTY, mmsintr, sc);
 	a.accessops = &mms_accessops;
 	a.accesscookie = sc;
 	/*
 	 * Attach the wsmouse, saving a handle to it.
 	 * Note that we don't need to check this pointer against NULL
 	 * here or in psmintr, because if this fails lms_enable() will
 	 * never be called, so lmsintr() will never be called.
 	 */
-	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL);
+	sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARGS_NONE);
+}
 static int
 mms_enable(void *v)
+{
 	struct mms_softc *sc = v;
 	if (sc->sc_enabled)
 		return EBUSY;
 	sc->sc_enabled = 1;
 	/* Enable interrupts. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: elan520.c,v 1.51 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: elan520.c,v 1.51.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 /*-
  * Copyright (c) 2002 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.
 @@ -30,27 +30,27 @@
  */
 /*
  * Device driver for the AMD Elan SC520 System Controller.  This attaches
  * where the "pchb" driver might normally attach, and provides support for
  * extra features on the SC520, such as the watchdog timer and GPIO.
+ *
  * Information about the GP bus echo bug work-around is from code posted
  * to the "soekris-tech" mailing list by Jasper Wallace.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.51 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.51.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
 #include <sys/mutex.h>
 #include <sys/wdog.h>
 #include <sys/reboot.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 @@ -1425,66 +1425,62 @@ elanpar_match(device_t parent, cfdata_t
 	struct elansc_softc *sc = device_private(parent);
 	return sc->sc_par == NULL;
+}
 /* scan for new children */
 static int
 elansc_rescan(device_t self, const char *ifattr, const int *locators)
+{
 	struct elansc_softc *sc = device_private(self);
 	if (ifattr_match(ifattr, "elanparbus") && sc->sc_par == NULL) {
 		sc->sc_par = config_found(sc->sc_dev, NULL, NULL,
-		    CFARG_IATTR, "elanparbus",
+		    CFARGS(.iattr = "elanparbus"));
 		    CFARG_EOL);
+	}
 	if (ifattr_match(ifattr, "elanpexbus") && sc->sc_pex == NULL) {
 		sc->sc_pex = config_found(sc->sc_dev, NULL, NULL,
-		    CFARG_IATTR, "elanpexbus",
+		    CFARGS(.iattr = "elanpexbus"));
 		    CFARG_EOL);
+	}
 	if (ifattr_match(ifattr, "gpiobus") && sc->sc_gpio == NULL) {
 #if NGPIO > 0
 		struct gpiobus_attach_args gba;
 		memset(&gba, 0, sizeof(gba));
 		gba.gba_gc = &sc->sc_gpio_gc;
 		gba.gba_pins = sc->sc_gpio_pins;
 		gba.gba_npins = ELANSC_PIO_NPINS;
 		sc->sc_gpio = config_found(sc->sc_dev, &gba, gpiobus_print,
-		    CFARG_IATTR, "gpiobus",
+		    CFARGS(.iattr = "gpiobus"));
 		    CFARG_EOL);
 #endif
+	}
 	if (ifattr_match(ifattr, "pcibus") && sc->sc_pci == NULL) {
 		struct pcibus_attach_args pba;
 		memset(&pba, 0, sizeof(pba));
 		pba.pba_iot = sc->sc_iot;
 		pba.pba_memt = sc->sc_memt;
 		pba.pba_dmat = sc->sc_dmat;
 		pba.pba_dmat64 = sc->sc_dmat64;
 		pba.pba_pc = sc->sc_pc;
 		pba.pba_flags = sc->sc_pciflags;
 		pba.pba_bus = 0;
 		pba.pba_bridgetag = NULL;
 		sc->sc_pci = config_found(self, &pba, pcibusprint,
-		    CFARG_IATTR, "pcibus",
+		    CFARGS(.iattr = "pcibus"));
 		    CFARG_EOL);
+	}
 	return 0;
+}
 CFATTACH_DECL3_NEW(elanpar, 0,
     elanpar_match, elanpar_attach, elanpar_detach, NULL, NULL, NULL,
     DVF_DETACH_SHUTDOWN);
 CFATTACH_DECL3_NEW(elanpex, 0,
     elanpex_match, elanpex_attach, elanpex_detach, NULL, NULL, NULL,
     DVF_DETACH_SHUTDOWN);

 @@ -1,14 +1,14 @@
-/* $NetBSD: gcscehci.c,v 1.14 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: gcscehci.c,v 1.14.8.1 2021/08/04 01:21:27 thorpej Exp $ */
 /*
  * Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net)
  * and Jared D. McNeill (jmcneill@invisible.ca)
+ *
  * 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
 @@ -21,27 +21,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: gcscehci.c,v 1.14 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.14.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <machine/cpufunc.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcivar.h>
 @@ -162,18 +162,18 @@ gcscehci_attach(device_t parent, device_
 				break;
+		}
+	}
 	sc->sc.sc_ncomp = ncomp;
 	int err = ehci_init(&sc->sc);
 	if (err) {
 		aprint_error("%s: init failed, error=%d\n", devname, err);
 		return;
+	}
 	/* Attach usb device. */
 	sc->sc.sc_child = config_found(self, &sc->sc.sc_bus, usbctlprint,
-	    CFARG_EOL);
+	    CFARGS_NONE);
+}
 CFATTACH_DECL_NEW(gcscehci, sizeof(struct gcscehci_softc),
     gcscehci_match, gcscehci_attach, NULL, ehci_activate);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: geode.c,v 1.16 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: geode.c,v 1.16.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
+ *
  * This code was written by David Young and merged with geodecntr code
  * by Frank Kardel.
+ *
  * 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
 @@ -54,27 +54,27 @@
  * 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.
  */
 /*
  * Device driver for the special devices attached to the GBA (watchdog, high
  * resolution counter, ...) in the AMD Geode SC1100 processor.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.16 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.16.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/wdog.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <arch/i386/pci/geodevar.h>
 #include <arch/i386/pci/geodereg.h>
 #include <dev/sysmon/sysmonvar.h>
 @@ -110,27 +110,27 @@ geode_gcb_attach(device_t parent, device
 	    &sc->sc_ioh) != 0) {
 		aprint_error(": unable to map registers\n");
 		return;
+	}
 	GEODE_DPRINTF(("%s: mapped %u bytes at %#08" PRIx32 "\n",
 	    device_xname(self), SC1100_GCB_SIZE, cba));
 	rev = bus_space_read_1(sc->sc_iot, sc->sc_ioh, SC1100_GCB_REV_B);
 	aprint_naive("\n");
 	aprint_normal(": AMD Geode GCB (rev. 0x%02x)\n", rev);
-	while (config_found(self, NULL, NULL, CFARG_EOL) != NULL)
+	while (config_found(self, NULL, NULL, CFARGS_NONE) != NULL)
 		/* empty */;
+}
 static int
 geode_gcb_detach(device_t self, int flags)
+{
 	int rc;
 	struct geode_gcb_softc *sc = device_private(self);
 	if ((rc = config_detach_children(self, flags)) != 0)
 		return rc;
 	bus_space_unmap(sc->sc_iot, sc->sc_ioh, SC1100_GCB_SIZE);
 	return 0;

 @@ -1,39 +1,39 @@
-/*	$NetBSD: gscpcib.c,v 1.19 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: gscpcib.c,v 1.19.8.1 2021/08/04 01:21:27 thorpej Exp $	*/
 /*	$OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
+ *
  * 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 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.
  */
 /*
  * Special driver for the National Semiconductor Geode SC1100 PCI-ISA bridge
  * that attaches instead of pcib(4). In addition to the core pcib(4)
  * functionality this driver provides support for the GPIO interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.19 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v 1.19.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 @@ -90,28 +90,27 @@ gscpcib_rescan(device_t self, const char
 #if NGPIO > 0
 	struct gscpcib_softc *sc = device_private(self);
 	/* Attach GPIO framework */
 	if (sc->sc_gpio_present && ifattr_match(ifattr, "gpiobus") &&
 	    sc->sc_gpiobus == NULL) {
 		struct gpiobus_attach_args gba;
 		gba.gba_gc = &sc->sc_gpio_gc;
 		gba.gba_pins = sc->sc_gpio_pins;
 		gba.gba_npins = GSCGPIO_NPINS;
 		sc->sc_gpiobus = config_found(self, &gba, gpiobus_print,
-		    CFARG_IATTR, "gpiobus",
+		    CFARGS(.iattr = "gpiobus"));
 		    CFARG_EOL);
 		return 0;
+	}
 #endif
 	return pcibrescan(self, ifattr, loc);
+}
 int
 gscpcib_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct pci_attach_args *pa = aux;
 	if (PCI_CLASS(pa->pa_class) != PCI_CLASS_BRIDGE ||

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pceb.c,v 1.25 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: pceb.c,v 1.25.8.1 2021/08/04 01:21:27 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: pceb.c,v 1.25 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.25.8.1 2021/08/04 01:21:27 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/eisa/eisavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -117,29 +117,27 @@ pceb_callback(device_t self)
+{
 	union pceb_attach_args ea;
 	/*
 	 * Attach the EISA bus behind this bridge.
 	 */
 	memset(&ea, 0, sizeof(ea));
 	ea.ea_eba.eba_iot = x86_bus_space_io;
 	ea.ea_eba.eba_memt = x86_bus_space_mem;
 #if NEISA > 0
 	ea.ea_eba.eba_dmat = &eisa_bus_dma_tag;
 #endif
 	config_found(self, &ea.ea_eba, eisabusprint,
-	    CFARG_IATTR, "eisabus",
+	    CFARGS(.iattr = "eisabus"));
 	    CFARG_EOL);
 	/*
 	 * Attach the ISA bus behind this bridge.
 	 */
 	memset(&ea, 0, sizeof(ea));
 	ea.ea_iba.iba_iot = x86_bus_space_io;
 	ea.ea_iba.iba_memt = x86_bus_space_mem;
 #if NISA > 0
 	ea.ea_iba.iba_dmat = &isa_bus_dma_tag;
 #endif
 	config_found(self, &ea.ea_iba, isabusprint,
-	    CFARG_IATTR, "isabus",
+	    CFARGS(.iattr = "isabus"));
 	    CFARG_EOL);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcmb.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $	*/
+/*	$NetBSD: pcmb.c,v 1.21.8.1 2021/08/04 01:21:27 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 and Jaromir Dolecek.
+ *
  * 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.
  */
 /*
  * "Driver" for PCI-MCA Bridges.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.21 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.21.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <dev/mca/mcavar.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 @@ -98,15 +98,15 @@ pcmb_callback(device_t self)
+{
 	struct mcabus_attach_args ma;
 	/*
 	 * Attach MCA bus behind this bridge.
 	 */
 	ma.mba_iot = x86_bus_space_io;
 	ma.mba_memt = x86_bus_space_mem;
 #if NMCA > 0
 	ma.mba_dmat = &mca_bus_dma_tag;
 #endif
 	ma.mba_mc = NULL;
 	ma.mba_bus = 0;
-	config_found(self, &ma, mcabusprint, CFARG_EOL);
+	config_found(self, &ma, mcabusprint, CFARGS_NONE);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: viapcib.c,v 1.18 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: viapcib.c,v 1.18.8.1 2021/08/04 01:21:27 thorpej Exp $ */
 /* $FreeBSD: src/sys/pci/viapm.c,v 1.10 2005/05/29 04:42:29 nyan Exp $ */
 /*-
  * Copyright (c) 2005, 2006 Jared D. McNeill <jmcneill@invisible.ca>
  * 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
 @@ -45,27 +45,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 THE AUTHOR 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: viapcib.c,v 1.18 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viapcib.c,v 1.18.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/i2c/i2cvar.h>
 @@ -205,28 +205,27 @@ core_pcib:
 		    device_xname(self), addr, sc->sc_revision);
 		/* Disable slave function */
 		b = viapcib_smbus_read(sc, SMBSLVCNT);
 		viapcib_smbus_write(sc, SMBSLVCNT, b & ~1);
 		memset(&iba, 0, sizeof(iba));
 		iba.iba_tag = &sc->sc_i2c;
 		iic_tag_init(&sc->sc_i2c);
 		iba.iba_tag->ic_cookie = (void *)sc;
 		iba.iba_tag->ic_exec = viapcib_exec;
 		config_found(self, &iba, iicbus_print,
-		    CFARG_IATTR, "i2cbus",
+		    CFARGS(.iattr = "i2cbus"));
 		    CFARG_EOL);
+	}
+}
 static int
 viapcib_wait(struct viapcib_softc *sc)
+{
 	int rv, timeout;
 	uint8_t val = 0;
 	timeout = VIAPCIB_SMBUS_TIMEOUT;
 	rv = 0;
 	while (timeout--) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: pnpbios.c,v 1.76 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: pnpbios.c,v 1.76.8.1 2021/08/04 01:21:27 thorpej Exp $ */
 /*
  * Copyright (c) 2000 Jason R. Thorpe.  All rights reserved.
  * Copyright (c) 2000 Christian E. Hopps.  All rights reserved.
  * Copyright (c) 1999
  * 	Matthias Drochner.  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
 @@ -31,27 +31,27 @@
 /*
  * PnP BIOS documentation is available at the following locations.
+ *
  * http://www.microsoft.com/hwdev/download/respec/pnpbios.zip
  * http://www.microsoft.com/hwdev/download/respec/biosclar.zip
  * http://www.microsoft.com/hwdev/download/resources/specs/devids.txt
+ *
  * PNPBIOSEVENTS is unfinished.  After coding what I did I discovered
  * I had no platforms to test on so someone else will need to finish
  * it.  I didn't want to toss the code though
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.76 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.76.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <uvm/uvm_extern.h>
 #include <machine/isa_machdep.h>
 #include <machine/segments.h>
 @@ -763,34 +763,32 @@ pnpbios_print_devres(device_t dev, struc
 	aprint_normal("\n");
+}
 static int
 pnpbios_attachchild(struct pnpbios_softc *sc,
 		    struct pnpbiosdev_attach_args *aa, int matchonly)
+{
 	int locs[PNPBIOSCF_NLOCS];
 	locs[PNPBIOSCF_INDEX] = aa->idx;
 	if (matchonly)
 		return (config_search(sc->sc_dev, aa,
-				      CFARG_SUBMATCH, config_stdsubmatch,
+				      CFARGS(.submatch = config_stdsubmatch,
-				      CFARG_LOCATORS, locs,
+					     .locators = locs)) != NULL);
 				      CFARG_EOL) != NULL);
 	else
 		return (config_found(sc->sc_dev, aa, pnpbios_print,
-				     CFARG_SUBMATCH, config_stdsubmatch,
+				     CFARGS(.submatch = config_stdsubmatch,
-				     CFARG_LOCATORS, locs,
+					    .locators = locs)) != NULL);
 				     CFARG_EOL) != NULL);
+}
 static int
 pnpbios_attachnode(struct pnpbios_softc *sc, int idx, const uint8_t *buf,
     size_t len, int matchonly)
+{
 	const struct pnpdevnode *dn;
 	const uint8_t *p;
 	char idstr[8];
 	struct pnpresources r, s;
 	struct pnpbiosdev_attach_args aa;
 	struct pnp_compatid *compatid;
 	int res, i;

 @@ -1,14 +1,14 @@
-/* $NetBSD: wss_pnpbios.c,v 1.23 2021/04/24 23:36:39 thorpej Exp $ */
+/* $NetBSD: wss_pnpbios.c,v 1.23.8.1 2021/08/04 01:21:27 thorpej Exp $ */
 /*
  * Copyright (c) 1999
  * 	Matthias Drochner.  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 @@
  * 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 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: wss_pnpbios.c,v 1.23 2021/04/24 23:36:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.c,v 1.23.8.1 2021/08/04 01:21:27 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <sys/audioio.h>
 #include <dev/audio/audio_if.h>
 @@ -158,16 +158,16 @@ wss_pnpbios_attach(device_t parent, devi
 		aprint_error_dev(self, "ad1848 probe failed\n");
 		return;
+	}
 	wssattach(sc);
 #if 0
 	/* XXX recdrq */
 	bus_space_write_1(sc->sc_iot, sc->sc_ioh, WSS_CONFIG,
 	    (interrupt_bits[sc->wss_irq] | dma_bits[sc->wss_playdrq]));
 #endif
 	arg.type = AUDIODEV_TYPE_OPL;
 	arg.hwif = 0;
 	arg.hdl = 0;
-	(void)config_found(self, &arg, audioprint, CFARG_EOL);
+	(void)config_found(self, &arg, audioprint, CFARGS_NONE);
+}