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

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Tue Aug  3 23:56:15 UTC 2021

Modified Files:
        src/sys/arch/cesfic/cesfic [thorpej-cfargs2]: autoconf.c
        src/sys/arch/cesfic/dev [thorpej-cfargs2]: zs.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.8.1 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/arch/cesfic/dev/zs.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/cesfic/cesfic/autoconf.c
diff -u src/sys/arch/cesfic/cesfic/autoconf.c:1.28 src/sys/arch/cesfic/cesfic/autoconf.c:1.28.8.1
--- src/sys/arch/cesfic/cesfic/autoconf.c:1.28	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/cesfic/autoconf.c	Tue Aug  3 23:56:15 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.28.8.1 2021/08/03 23:56:15 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,8 +90,7 @@ mainbusattach(device_t parent, device_t 
 
 	/* Search for and attach children. */
 	config_search(self, NULL,
-	    CFARG_SEARCH, mainbussearch,
-	    CFARG_EOL);
+	    CFARGS(.search = mainbussearch));
 }
 
 int
@@ -99,7 +98,7 @@ mainbussearch(device_t parent, cfdata_t 
 {
 
 	if (config_probe(parent, cf, NULL))
-		config_attach(parent, cf, NULL, NULL, CFARG_EOL);
+		config_attach(parent, cf, NULL, NULL, CFARGS_NONE);
 	return (0);
 }
 

Index: src/sys/arch/cesfic/dev/zs.c
diff -u src/sys/arch/cesfic/dev/zs.c:1.22 src/sys/arch/cesfic/dev/zs.c:1.22.8.1
--- src/sys/arch/cesfic/dev/zs.c:1.22	Sat Apr 24 23:36:30 2021
+++ src/sys/arch/cesfic/dev/zs.c	Tue Aug  3 23:56:15 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $	*/
+/*	$NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22 2021/04/24 23:36:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.22.8.1 2021/08/03 23:56:15 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -165,7 +165,7 @@ zs_config(struct zsc_softc *zsc, char *b
 		 * 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;