Module Name:    src
Committed By:   thorpej
Date:           Wed Aug  4 02:45:07 UTC 2021

Modified Files:
        src/sys/arch/mipsco/isa [thorpej-cfargs2]: isa_machdep.c
        src/sys/arch/mipsco/mipsco [thorpej-cfargs2]: mainbus.c
        src/sys/arch/mipsco/obio [thorpej-cfargs2]: obio.c zs.c
        src/sys/arch/mmeye/dev [thorpej-cfargs2]: mmeyepcmcia.c rtciic.c
        src/sys/arch/mmeye/mmeye [thorpej-cfargs2]: mainbus.c
        src/sys/arch/mvme68k/dev [thorpej-cfargs2]: mainbus.c pcc.c wdsc.c zs.c
        src/sys/arch/mvmeppc/mvmeppc [thorpej-cfargs2]: mainbus.c
        src/sys/arch/netwinder/pci [thorpej-cfargs2]: pcib.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/isa/isa_machdep.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/mipsco/mipsco/mainbus.c
cvs rdiff -u -r1.18 -r1.18.8.1 src/sys/arch/mipsco/obio/obio.c
cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/mipsco/obio/zs.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/mmeye/dev/rtciic.c
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/mmeye/mmeye/mainbus.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/mvme68k/dev/mainbus.c
cvs rdiff -u -r1.34 -r1.34.8.1 src/sys/arch/mvme68k/dev/pcc.c \
    src/sys/arch/mvme68k/dev/wdsc.c
cvs rdiff -u -r1.43 -r1.43.8.1 src/sys/arch/mvme68k/dev/zs.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/arch/netwinder/pci/pcib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.18 src/sys/arch/mipsco/isa/isa_machdep.c:1.18.8.1
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.18	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/isa/isa_machdep.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -144,7 +144,7 @@ isabusattach(device_t parent, device_t s
 	(*platform.intr_establish)(SYS_INTR_ATBUS, isa_intr, ic);
 
 	printf("\n");
-	config_found(self, &iba, mipscoisabusprint, CFARG_EOL);
+	config_found(self, &iba, mipscoisabusprint, CFARGS_NONE);
 }
 
 int

Index: src/sys/arch/mipsco/mipsco/mainbus.c
diff -u src/sys/arch/mipsco/mipsco/mainbus.c:1.11 src/sys/arch/mipsco/mipsco/mainbus.c:1.11.8.1
--- src/sys/arch/mipsco/mipsco/mainbus.c:1.11	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/mipsco/mainbus.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,15 +66,15 @@ mbattach(device_t parent, device_t self,
 
 	nca.ca_name = "cpu";
 	nca.ca_addr = 0;
-	config_found(self, &nca, mbprint, CFARG_EOL);
+	config_found(self, &nca, mbprint, CFARGS_NONE);
 
 	nca.ca_name = "obio";
 	nca.ca_addr = 0;
-	config_found(self, &nca, NULL, CFARG_EOL);
+	config_found(self, &nca, NULL, CFARGS_NONE);
 
 	nca.ca_name = "isabus";		/* XXX */
 	nca.ca_addr = 0;
-	config_found(self, &nca, NULL, CFARG_EOL);
+	config_found(self, &nca, NULL, CFARGS_NONE);
 
 }
 

Index: src/sys/arch/mipsco/obio/obio.c
diff -u src/sys/arch/mipsco/obio/obio.c:1.18 src/sys/arch/mipsco/obio/obio.c:1.18.8.1
--- src/sys/arch/mipsco/obio/obio.c:1.18	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/obio/obio.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.18.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include "locators.h"
 
@@ -87,8 +87,7 @@ obio_attach(device_t parent, device_t se
 
 	printf("\n");
 	config_search(self, ca,
-	    CFARG_SEARCH, obio_search,
-	    CFARG_EOL);
+	    CFARGS(.search = obio_search));
 }
 
 static int
@@ -100,7 +99,7 @@ obio_search(device_t parent, cfdata_t cf
 	ca->ca_name = cf->cf_name;
 
 	if (config_probe(parent, cf, ca))
-		config_attach(parent, cf, ca, obio_print, CFARG_EOL);
+		config_attach(parent, cf, ca, obio_print, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/mipsco/obio/zs.c
diff -u src/sys/arch/mipsco/obio/zs.c:1.26 src/sys/arch/mipsco/obio/zs.c:1.26.8.1
--- src/sys/arch/mipsco/obio/zs.c:1.26	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mipsco/obio/zs.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.26 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.26.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.26 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.26.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -268,7 +268,7 @@ zs_attach(device_t parent, device_t self
 		 * 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;

Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.24 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.24.8.1
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.24	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mmeyepcmcia.c,v 1.24 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: mmeyepcmcia.c,v 1.24.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.24 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.24.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -363,7 +363,7 @@ mmeyepcmcia_attach_socket(struct mmeyepc
 	paa.pch = (pcmcia_chipset_handle_t) h;
 
 	h->pcmcia =
-	    config_found(h->sc->dev, &paa, mmeyepcmcia_print, CFARG_EOL);
+	    config_found(h->sc->dev, &paa, mmeyepcmcia_print, CFARGS_NONE);
 
 	/* if there's actually a pcmcia device attached, initialize the slot */
 

Index: src/sys/arch/mmeye/dev/rtciic.c
diff -u src/sys/arch/mmeye/dev/rtciic.c:1.4 src/sys/arch/mmeye/dev/rtciic.c:1.4.8.1
--- src/sys/arch/mmeye/dev/rtciic.c:1.4	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mmeye/dev/rtciic.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtciic.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: rtciic.c,v 1.4.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 /*
  * Copyright (c) 2011 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtciic.c,v 1.4 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtciic.c,v 1.4.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,7 +143,7 @@ rtciic_attach(device_t parent, device_t 
 
 	memset(&iba, 0, sizeof(iba));
 	iba.iba_tag = &sc->sc_i2c;
-	config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+	config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
 }
 
 static int

Index: src/sys/arch/mmeye/mmeye/mainbus.c
diff -u src/sys/arch/mmeye/mmeye/mainbus.c:1.10 src/sys/arch/mmeye/mmeye/mainbus.c:1.10.8.1
--- src/sys/arch/mmeye/mmeye/mainbus.c:1.10	Sat Apr 24 23:36:43 2021
+++ src/sys/arch/mmeye/mmeye/mainbus.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:43 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2021/04/24 23:36:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -64,14 +64,13 @@ mainbus_attach(device_t parent, device_t
 
 	/* CPU and SHBus */
 	maa.ma_name = "cpu";
-	config_found(self, &maa, mainbus_print, CFARG_EOL);
+	config_found(self, &maa, mainbus_print, CFARGS_NONE);
 	maa.ma_name = "shb";
-	config_found(self, &maa, mainbus_print, CFARG_EOL);
+	config_found(self, &maa, mainbus_print, CFARGS_NONE);
 
 	/* Devices */
 	config_search(self, NULL,
-	    CFARG_SEARCH, mainbus_search,
-	    CFARG_EOL);
+	    CFARGS(.search = mainbus_search));
 }
 
 static int
@@ -90,7 +89,7 @@ mainbus_search(device_t parent, cfdata_t
 	maa.ma_irq2 = cf->cf_loc[MAINBUSCF_IRQ2];
 
 	if (config_probe(parent, cf, &maa))
-		config_attach(parent, cf, &maa, mainbus_print, CFARG_EOL);
+		config_attach(parent, cf, &maa, mainbus_print, CFARGS_NONE);
 
 	return 0;
 }

Index: src/sys/arch/mvme68k/dev/mainbus.c
diff -u src/sys/arch/mvme68k/dev/mainbus.c:1.22 src/sys/arch/mvme68k/dev/mainbus.c:1.22.8.1
--- src/sys/arch/mvme68k/dev/mainbus.c:1.22	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/mvme68k/dev/mainbus.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.22 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.22.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include "vmetwo.h"
 
@@ -192,7 +192,7 @@ mainbus_attach(device_t parent, device_t
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = devices[i].md_offset + intiobase_phys;
 
-		(void)config_found(self, &ma, mainbus_print, CFARG_EOL);
+		(void)config_found(self, &ma, mainbus_print, CFARGS_NONE);
 	}
 
 
@@ -212,9 +212,9 @@ mainbus_attach(device_t parent, device_t
 		ma.ma_dmat = &_mainbus_dma_tag;
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = MAINBUS_MEMC1_OFFSET + intiobase_phys;
-		(void)config_found(self, &ma, mainbus_print, CFARG_EOL);
+		(void)config_found(self, &ma, mainbus_print, CFARGS_NONE);
 		ma.ma_offset = MAINBUS_MEMC2_OFFSET + intiobase_phys;
-		(void)config_found(self, &ma, mainbus_print, CFARG_EOL);
+		(void)config_found(self, &ma, mainbus_print, CFARGS_NONE);
 	}
 #endif
 
@@ -230,7 +230,7 @@ mainbus_attach(device_t parent, device_t
 		ma.ma_dmat = &_mainbus_dma_tag;
 		ma.ma_bust = &_mainbus_space_tag;
 		ma.ma_offset = MAINBUS_IPACK_OFFSET + intiobase_phys;
-		(void)config_found(self, &ma, mainbus_print, CFARG_EOL);
+		(void)config_found(self, &ma, mainbus_print, CFARGS_NONE);
 	}
 #endif
 }

Index: src/sys/arch/mvme68k/dev/pcc.c
diff -u src/sys/arch/mvme68k/dev/pcc.c:1.34 src/sys/arch/mvme68k/dev/pcc.c:1.34.8.1
--- src/sys/arch/mvme68k/dev/pcc.c:1.34	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/mvme68k/dev/pcc.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcc.c,v 1.34 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: pcc.c,v 1.34.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.34 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcc.c,v 1.34.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -220,7 +220,7 @@ pccattach(device_t parent, device_t self
 		npa.pa_offset = pcc_devices[i].pcc_offset + ma->ma_offset;
 
 		/* Attach the device if configured. */
-		(void)config_found(self, &npa, pccprint, CFARG_EOL);
+		(void)config_found(self, &npa, pccprint, CFARGS_NONE);
 	}
 }
 
Index: src/sys/arch/mvme68k/dev/wdsc.c
diff -u src/sys/arch/mvme68k/dev/wdsc.c:1.34 src/sys/arch/mvme68k/dev/wdsc.c:1.34.8.1
--- src/sys/arch/mvme68k/dev/wdsc.c:1.34	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/mvme68k/dev/wdsc.c	Wed Aug  4 02:45:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdsc.c,v 1.34 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: wdsc.c,v 1.34.8.1 2021/08/04 02:45:06 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.34 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.34.8.1 2021/08/04 02:45:06 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -191,7 +191,7 @@ wdsc_pcc_attach(device_t parent, device_
 	pcc_reg_write(sys_pcc, PCCREG_SCSI_INTR_CTRL,
             sc->sc_ipl | PCC_IENABLE | PCC_ICLEAR);
 
-	(void)config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+	(void)config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
 }
 
 /*

Index: src/sys/arch/mvme68k/dev/zs.c
diff -u src/sys/arch/mvme68k/dev/zs.c:1.43 src/sys/arch/mvme68k/dev/zs.c:1.43.8.1
--- src/sys/arch/mvme68k/dev/zs.c:1.43	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/mvme68k/dev/zs.c	Wed Aug  4 02:45:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.43 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.43.8.1 2021/08/04 02:45:07 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.43 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.43.8.1 2021/08/04 02:45:07 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -194,7 +194,7 @@ zs_config(struct zsc_softc *zsc, struct 
 		 * The child attach will setup the hardware.
 		 */
 		if (!config_found(zsc->zsc_dev, (void *)&zsc_args,
-		    zsc_print, CFARG_EOL)) {
+		    zsc_print, CFARGS_NONE)) {
 			/* No sub-driver.  Just reset it. */
 			uint8_t reset = (channel == 0) ?
 				ZSWR9_A_RESET : ZSWR9_B_RESET;

Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.21 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.21.8.1
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.21	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c	Wed Aug  4 02:45:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:45:07 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.8.1 2021/08/04 02:45:07 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,8 +99,7 @@ mainbus_attach(device_t parent, device_t
 
 	/* attach cpu */
 	config_found(self, NULL, mainbus_print,
-	    CFARG_IATTR, "mainbus",
-	    CFARG_EOL);
+	    CFARGS(.iattr = "mainbus"));
 
 	/*
 	 * XXX Note also that the presence of a PCI bus should
@@ -141,8 +140,7 @@ mainbus_attach(device_t parent, device_t
 	pba.pba_bridgetag = NULL;
 	pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 	config_found(self, &pba, pcibusprint,
-	    CFARG_IATTR, "pcibus",
-	    CFARG_EOL);
+	    CFARGS(.iattr = "pcibus"));
 #endif
 }
 

Index: src/sys/arch/netwinder/pci/pcib.c
diff -u src/sys/arch/netwinder/pci/pcib.c:1.17 src/sys/arch/netwinder/pci/pcib.c:1.17.8.1
--- src/sys/arch/netwinder/pci/pcib.c:1.17	Sat Apr 24 23:36:44 2021
+++ src/sys/arch/netwinder/pci/pcib.c	Wed Aug  4 02:45:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.17 2021/04/24 23:36:44 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.17.8.1 2021/08/04 02:45:07 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17 2021/04/24 23:36:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.17.8.1 2021/08/04 02:45:07 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,5 +118,5 @@ pcib_callback(device_t self)
 #if NISADMA > 0
 	iba.iba_dmat = &isa_bus_dma_tag;
 #endif
-	config_found(self, &iba, isabusprint, CFARG_EOL);
+	config_found(self, &iba, isabusprint, CFARGS_NONE);
 }

Reply via email to