evbmips

Jason R Thorpe Tue, 03 Aug 2021 20:24:27 -0700

Module Name:    src
Committed By:   thorpej
Date:           Wed Aug  4 03:24:21 UTC 2021


Modified Files:
        src/sys/arch/evbmips/adm5120 [thorpej-cfargs2]: mainbus.c
        src/sys/arch/evbmips/alchemy [thorpej-cfargs2]: mainbus.c obio.c
        src/sys/arch/evbmips/atheros [thorpej-cfargs2]: mainbus.c
        src/sys/arch/evbmips/gdium [thorpej-cfargs2]: bonito_mainbus.c
            mainbus.c
        src/sys/arch/evbmips/ingenic [thorpej-cfargs2]: mainbus.c
        src/sys/arch/evbmips/loongson [thorpej-cfargs2]: bonito_mainbus.c
            mainbus.c
        src/sys/arch/evbmips/loongson/dev [thorpej-cfargs2]: pcib.c
        src/sys/arch/evbmips/malta/dev [thorpej-cfargs2]: gt.c mainbus.c
        src/sys/arch/evbmips/malta/pci [thorpej-cfargs2]: pcib.c
        src/sys/arch/evbmips/mipssim [thorpej-cfargs2]: mainbus.c
            virtio_mainbus.c
        src/sys/arch/evbmips/sbmips [thorpej-cfargs2]: zbbus.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/adm5120/mainbus.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/arch/evbmips/alchemy/mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/alchemy/obio.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/evbmips/atheros/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/gdium/bonito_mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/gdium/mainbus.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbmips/ingenic/mainbus.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/evbmips/loongson/bonito_mainbus.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/arch/evbmips/loongson/mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/loongson/dev/pcib.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/arch/evbmips/malta/dev/gt.c \
    src/sys/arch/evbmips/malta/dev/mainbus.c
cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/arch/evbmips/malta/pci/pcib.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/mipssim/mainbus.c
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbmips/mipssim/virtio_mainbus.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/arch/evbmips/sbmips/zbbus.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/evbmips/adm5120/mainbus.c
diff -u src/sys/arch/evbmips/adm5120/mainbus.c:1.4 src/sys/arch/evbmips/adm5120/mainbus.c:1.4.8.1
--- src/sys/arch/evbmips/adm5120/mainbus.c:1.4	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/adm5120/mainbus.c	Wed Aug  4 03:24:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.8.1 2021/08/04 03:24:19 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -153,8 +153,7 @@ mainbus_attach(device_t parent, device_t
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		ma.ma_name = md->md_name;
 		config_found(self, &ma, mainbus_print,
-		    CFARG_IATTR, "mainbus",
-		    CFARG_EOL);
+		    CFARGS(.iattr = "mainbus"));
 	}
 }
 

Index: src/sys/arch/evbmips/alchemy/mainbus.c
diff -u src/sys/arch/evbmips/alchemy/mainbus.c:1.11 src/sys/arch/evbmips/alchemy/mainbus.c:1.11.8.1
--- src/sys/arch/evbmips/alchemy/mainbus.c:1.11	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -87,7 +87,7 @@ mainbus_attach(device_t parent, device_t
 	printf("\n");
 
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
-		config_found(self, NULL, mainbus_print, CFARG_EOL);
+		config_found(self, NULL, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/alchemy/obio.c
diff -u src/sys/arch/evbmips/alchemy/obio.c:1.5 src/sys/arch/evbmips/alchemy/obio.c:1.5.8.1
--- src/sys/arch/evbmips/alchemy/obio.c:1.5	Sat Apr 24 23:36:34 2021
+++ src/sys/arch/evbmips/alchemy/obio.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $ */
+/* $NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5 2021/04/24 23:36:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,8 +89,7 @@ obio_attach(device_t parent, device_t se
 		oa.oba_addr = od->od_addr;
 		oa.oba_irq = od->od_irq;
 		config_found(self, &oa, obio_print,
-		    CFARG_SUBMATCH, obio_submatch,
-		    CFARG_EOL);
+		    CFARGS(.submatch = obio_submatch));
 	}
 }
 

Index: src/sys/arch/evbmips/atheros/mainbus.c
diff -u src/sys/arch/evbmips/atheros/mainbus.c:1.6 src/sys/arch/evbmips/atheros/mainbus.c:1.6.8.1
--- src/sys/arch/evbmips/atheros/mainbus.c:1.6	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/atheros/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:35 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@ mainbus_attach(device_t parent, device_t
 
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		struct mainbusdev ma = *md;
-		config_found(self, &ma, mainbus_print, CFARG_EOL);
+		config_found(self, &ma, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/gdium/bonito_mainbus.c
diff -u src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.4 src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.4.8.1
--- src/sys/arch/evbmips/gdium/bonito_mainbus.c:1.4	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/gdium/bonito_mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.4 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.4.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.4 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.4.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -92,5 +92,5 @@ bonito_mainbus_attach(device_t parent, d
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = &gc->gc_pc;
 
-	config_found(self, &pba, pcibusprint, CFARG_EOL);
+	config_found(self, &pba, pcibusprint, CFARGS_NONE);
 }

Index: src/sys/arch/evbmips/gdium/mainbus.c
diff -u src/sys/arch/evbmips/gdium/mainbus.c:1.8 src/sys/arch/evbmips/gdium/mainbus.c:1.8.8.1
--- src/sys/arch/evbmips/gdium/mainbus.c:1.8	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/gdium/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include "opt_pci.h"
 
@@ -120,7 +120,7 @@ mainbus_attach(device_t parent, device_t
 	for (i = 0; i < __arraycount(mainbusdevs); i++) {
 		struct mainbus_attach_args maa;
 		maa.maa_name = mainbusdevs[i];
-		(void) config_found(self, &maa, mainbus_print, CFARG_EOL);
+		(void) config_found(self, &maa, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/ingenic/mainbus.c
diff -u src/sys/arch/evbmips/ingenic/mainbus.c:1.8 src/sys/arch/evbmips/ingenic/mainbus.c:1.8.8.1
--- src/sys/arch/evbmips/ingenic/mainbus.c:1.8	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/ingenic/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:35 thorpej Exp $ */
+/*	$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:24:20 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -87,7 +87,7 @@ mainbus_attach(device_t parent, device_t
 
 	for (md = mainbusdevs; md->md_name != NULL; md++) {
 		struct mainbusdev ma = *md;
-		config_found(self, &ma, mainbus_print, CFARG_EOL);
+		config_found(self, &ma, mainbus_print, CFARGS_NONE);
 	}
 
 #ifdef INGENIC_DEBUG

Index: src/sys/arch/evbmips/loongson/bonito_mainbus.c
diff -u src/sys/arch/evbmips/loongson/bonito_mainbus.c:1.4 src/sys/arch/evbmips/loongson/bonito_mainbus.c:1.4.8.1
--- src/sys/arch/evbmips/loongson/bonito_mainbus.c:1.4	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/loongson/bonito_mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bonito_mainbus.c,v 1.4 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: bonito_mainbus.c,v 1.4.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.4 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.4.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,5 +114,5 @@ bonito_mainbus_attach(device_t parent, d
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = &bonito_pc;
 
-	config_found(self, &pba, pcibusprint, CFARG_EOL);
+	config_found(self, &pba, pcibusprint, CFARGS_NONE);
 }

Index: src/sys/arch/evbmips/loongson/mainbus.c
diff -u src/sys/arch/evbmips/loongson/mainbus.c:1.5 src/sys/arch/evbmips/loongson/mainbus.c:1.5.8.1
--- src/sys/arch/evbmips/loongson/mainbus.c:1.5	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/loongson/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include "opt_pci.h"
 
@@ -124,7 +124,7 @@ mainbus_attach(device_t parent, device_t
 	for (i = 0; i < __arraycount(mainbusdevs); i++) {
 		struct mainbus_attach_args maa;
 		maa.maa_name = mainbusdevs[i];
-		(void) config_found(self, &maa, mainbus_print, CFARG_EOL);
+		(void) config_found(self, &maa, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/loongson/dev/pcib.c
diff -u src/sys/arch/evbmips/loongson/dev/pcib.c:1.3 src/sys/arch/evbmips/loongson/dev/pcib.c:1.3.8.1
--- src/sys/arch/evbmips/loongson/dev/pcib.c:1.3	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/loongson/dev/pcib.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.3.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.3.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -167,8 +167,7 @@ pcibrescan(device_t self, const char *if
 		if (iba.iba_ic != NULL) 
 			sc->sc_isabus =
 			    config_found(self, &iba, isabusprint,
-					 CFARG_IATTR, "isabus",
-					 CFARG_EOL);
+					 CFARGS(.iattr = "isabus"));
 	}
 	return 0;
 }

Index: src/sys/arch/evbmips/malta/dev/gt.c
diff -u src/sys/arch/evbmips/malta/dev/gt.c:1.16 src/sys/arch/evbmips/malta/dev/gt.c:1.16.8.1
--- src/sys/arch/evbmips/malta/dev/gt.c:1.16	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/malta/dev/gt.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gt.c,v 1.16 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: gt.c,v 1.16.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.16 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.16.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,7 +118,7 @@ gt_attach(device_t parent, device_t self
 	pba.pba_dmat64 = NULL;
 	pba.pba_pc = &mcp->mc_pc;
 
-	config_found(self, &pba, gt_print, CFARG_EOL);
+	config_found(self, &pba, gt_print, CFARGS_NONE);
 #endif
 }
 
Index: src/sys/arch/evbmips/malta/dev/mainbus.c
diff -u src/sys/arch/evbmips/malta/dev/mainbus.c:1.16 src/sys/arch/evbmips/malta/dev/mainbus.c:1.16.8.1
--- src/sys/arch/evbmips/malta/dev/mainbus.c:1.16	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/malta/dev/mainbus.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include "opt_pci.h"
 
@@ -158,8 +158,7 @@ mainbus_attach(device_t parent, device_t
 		ma.ma_addr = md->md_addr;
 		ma.ma_intr = md->md_intr;
 		config_found(self, &ma, mainbus_print,
-		    CFARG_SUBMATCH, mainbus_submatch,
-		    CFARG_EOL);
+		    CFARGS(.submatch = mainbus_submatch));
 	}
 }
 

Index: src/sys/arch/evbmips/malta/pci/pcib.c
diff -u src/sys/arch/evbmips/malta/pci/pcib.c:1.21 src/sys/arch/evbmips/malta/pci/pcib.c:1.21.8.1
--- src/sys/arch/evbmips/malta/pci/pcib.c:1.21	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/malta/pci/pcib.c	Wed Aug  4 03:24:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcib.c,v 1.21 2021/04/24 23:36:35 thorpej Exp $	*/
+/*	$NetBSD: pcib.c,v 1.21.8.1 2021/08/04 03:24:20 thorpej Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.21.8.1 2021/08/04 03:24:20 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -352,7 +352,7 @@ pcib_bridge_callback(device_t self)
 	iba.iba_ic->ic_attach_hook = pcib_isa_attach_hook;
 	iba.iba_ic->ic_detach_hook = pcib_isa_detach_hook;
 
-	config_found(self, &iba, isabusprint, CFARG_EOL);
+	config_found(self, &iba, isabusprint, CFARGS_NONE);
 }
 
 static void

Index: src/sys/arch/evbmips/mipssim/mainbus.c
diff -u src/sys/arch/evbmips/mipssim/mainbus.c:1.3 src/sys/arch/evbmips/mipssim/mainbus.c:1.3.8.1
--- src/sys/arch/evbmips/mipssim/mainbus.c:1.3	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/mipssim/mainbus.c	Wed Aug  4 03:24:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 03:24:21 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3.8.1 2021/08/04 03:24:21 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -91,7 +91,7 @@ mainbus_attach(device_t parent, device_t
 		maa.ma_irq = md->md_irq;
 		maa.ma_iot = &mcp->mc_iot;
 		maa.ma_dmat = &mcp->mc_dmat;
-		config_found(self, &maa, mainbus_print, CFARG_EOL);
+		config_found(self, &maa, mainbus_print, CFARGS_NONE);
 	}
 
 	/* attach virtio children */
@@ -101,7 +101,7 @@ mainbus_attach(device_t parent, device_t
 		maa.ma_irq  = 1;
 		maa.ma_iot  = &mcp->mc_iot;
 		maa.ma_dmat = &mcp->mc_dmat;
-		config_found(self, &maa, mainbus_print, CFARG_EOL);
+		config_found(self, &maa, mainbus_print, CFARGS_NONE);
 	}
 }
 

Index: src/sys/arch/evbmips/mipssim/virtio_mainbus.c
diff -u src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.2 src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.2.8.1
--- src/sys/arch/evbmips/mipssim/virtio_mainbus.c:1.2	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/mipssim/virtio_mainbus.c	Wed Aug  4 03:24:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mainbus.c,v 1.2 2021/04/24 23:36:35 thorpej Exp $ */
+/* $NetBSD: virtio_mainbus.c,v 1.2.8.1 2021/08/04 03:24:21 thorpej Exp $ */
 
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.2 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.2.8.1 2021/08/04 03:24:21 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -127,7 +127,7 @@ virtio_mainbus_rescan(device_t self, con
 	memset(&va, 0, sizeof(va));
 	va.sc_childdevid = vsc->sc_childdevid;
 
-	config_found(self, &va, NULL, CFARG_EOL);
+	config_found(self, &va, NULL, CFARGS_NONE);
 
 	if (virtio_attach_failed(vsc))
 		return 0;

Index: src/sys/arch/evbmips/sbmips/zbbus.c
diff -u src/sys/arch/evbmips/sbmips/zbbus.c:1.3 src/sys/arch/evbmips/sbmips/zbbus.c:1.3.8.1
--- src/sys/arch/evbmips/sbmips/zbbus.c:1.3	Sat Apr 24 23:36:35 2021
+++ src/sys/arch/evbmips/sbmips/zbbus.c	Wed Aug  4 03:24:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zbbus.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $ */
+/* $NetBSD: zbbus.c,v 1.3.8.1 2021/08/04 03:24:21 thorpej Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.3 2021/04/24 23:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbbus.c,v 1.3.8.1 2021/08/04 03:24:21 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,8 +91,7 @@ zbbus_attach(device_t parent, device_t s
 		memset(&za, 0, sizeof za);
 		za.za_locs = sb1250_zbbus_devs[i];
 		config_found(self, &za, zbbus_print,
-		    CFARG_SUBMATCH, zbbus_submatch,
-		    CFARG_EOL);
+		    CFARGS(.submatch = zbbus_submatch));
 	}
 
 	return;

CVS commit: [thorpej-cfargs2] src/sys/arch/evbmips

Reply via email to