Module Name:    src
Committed By:   thorpej
Date:           Wed Aug  4 18:53:26 UTC 2021

Modified Files:
        src/sys/dev/i2c [thorpej-cfargs2]: as3722.c axp20x.c axppmic.c
            gttwsi_core.c i2c.c i2cmux.c ihidev.c motoi2c.c rkpmic.c tcakp.c
            tps65217pmic.c w83795g.c
        src/sys/dev/i2o [thorpej-cfargs2]: iop.c iopsp.c

Log Message:
Adapt to CFARGS().


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/dev/i2c/as3722.c
cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/dev/i2c/axp20x.c
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/i2c/axppmic.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/i2c/gttwsi_core.c
cvs rdiff -u -r1.79 -r1.79.2.1 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.5 -r1.5.8.1 src/sys/dev/i2c/i2cmux.c
cvs rdiff -u -r1.19 -r1.19.8.1 src/sys/dev/i2c/ihidev.c \
    src/sys/dev/i2c/tps65217pmic.c
cvs rdiff -u -r1.11 -r1.11.8.1 src/sys/dev/i2c/motoi2c.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sys/dev/i2c/rkpmic.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/i2c/tcakp.c
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/dev/i2c/w83795g.c
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/dev/i2o/iop.c
cvs rdiff -u -r1.39 -r1.39.8.1 src/sys/dev/i2o/iopsp.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/dev/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.23 src/sys/dev/i2c/as3722.c:1.23.8.1
--- src/sys/dev/i2c/as3722.c:1.23	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/as3722.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: as3722.c,v 1.23.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.23.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -514,7 +514,7 @@ as3722_regulator_attach(struct as3722_so
 			continue;
 		raa.reg_def = regdef;
 		raa.reg_phandle = child;
-		config_found(sc->sc_dev, &raa, NULL, CFARG_EOL);
+		config_found(sc->sc_dev, &raa, NULL, CFARGS_NONE);
 	}
 }
 

Index: src/sys/dev/i2c/axp20x.c
diff -u src/sys/dev/i2c/axp20x.c:1.20 src/sys/dev/i2c/axp20x.c:1.20.8.1
--- src/sys/dev/i2c/axp20x.c:1.20	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/axp20x.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: axp20x.c,v 1.20.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp20x.c,v 1.20.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -813,6 +813,6 @@ axp20x_fdt_attach(struct axp20x_softc *s
 
 	for (child = OF_child(regulators_phandle); child; child = OF_peer(child)) {
 		struct axp20xreg_attach_args reg = { .reg_phandle = child };
-		config_found(sc->sc_dev, &reg, NULL, CFARG_EOL);
+		config_found(sc->sc_dev, &reg, NULL, CFARGS_NONE);
 	}
 }

Index: src/sys/dev/i2c/axppmic.c
diff -u src/sys/dev/i2c/axppmic.c:1.35 src/sys/dev/i2c/axppmic.c:1.35.4.1
--- src/sys/dev/i2c/axppmic.c:1.35	Mon May 24 05:58:42 2021
+++ src/sys/dev/i2c/axppmic.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: axppmic.c,v 1.35 2021/05/24 05:58:42 skrll Exp $ */
+/* $NetBSD: axppmic.c,v 1.35.4.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014-2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.35 2021/05/24 05:58:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.35.4.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1052,7 +1052,7 @@ axppmic_attach(device_t parent, device_t
 				continue;
 			aaa.reg_ctrl = ctrl;
 			aaa.reg_phandle = child;
-			config_found(sc->sc_dev, &aaa, NULL, CFARG_EOL);
+			config_found(sc->sc_dev, &aaa, NULL, CFARGS_NONE);
 		}
 	}
 

Index: src/sys/dev/i2c/gttwsi_core.c
diff -u src/sys/dev/i2c/gttwsi_core.c:1.17 src/sys/dev/i2c/gttwsi_core.c:1.17.8.1
--- src/sys/dev/i2c/gttwsi_core.c:1.17	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/gttwsi_core.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gttwsi_core.c,v 1.17 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: gttwsi_core.c,v 1.17.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 /*
  * Copyright (c) 2008 Eiji Kawauchi.
  * All rights reserved.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.17 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gttwsi_core.c,v 1.17.8.1 2021/08/04 18:53:26 thorpej Exp $");
 #include "locators.h"
 
 #include <sys/param.h>
@@ -164,8 +164,7 @@ gttwsi_config_children(device_t self)
 	iba.iba_tag = &sc->sc_i2c;
 
 	config_found(sc->sc_dev, &iba, iicbus_print,
-	    CFARG_IATTR, "i2cbus",
-	    CFARG_EOL);
+	    CFARGS(.iattr = "i2cbus"));
 }
 
 int

Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.79 src/sys/dev/i2c/i2c.c:1.79.2.1
--- src/sys/dev/i2c/i2c.c:1.79	Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/i2c.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2c.c,v 1.79 2021/06/21 03:12:54 christos Exp $	*/
+/*	$NetBSD: i2c.c,v 1.79.2.1 2021/08/04 18:53:26 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.79 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.79.2.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -358,7 +358,7 @@ iic_search(device_t parent, cfdata_t cf,
 			continue;
 
 		sc->sc_devices[ia.ia_addr] =
-		    config_attach(parent, cf, &ia, iic_print, CFARG_EOL);
+		    config_attach(parent, cf, &ia, iic_print, CFARGS_NONE);
 	}
 
 	return 0;
@@ -381,9 +381,8 @@ static int
 iic_rescan(device_t self, const char *ifattr, const int *locators)
 {
 	config_search(self, NULL,
-	    CFARG_SEARCH, iic_search,
-	    CFARG_LOCATORS, locators,
-	    CFARG_EOL);
+	    CFARGS(.search = iic_search,
+		   .locators = locators));
 	return 0;
 }
 
@@ -494,8 +493,7 @@ iic_attach(device_t parent, device_t sel
 					sc->sc_devices[addr] =
 					    config_found(self, &ia,
 					    iic_print_direct,
-					    CFARG_LOCATORS, loc,
-					    CFARG_EOL);
+					    CFARGS(.locators = loc));
 				}
 			}
 

Index: src/sys/dev/i2c/i2cmux.c
diff -u src/sys/dev/i2c/i2cmux.c:1.5 src/sys/dev/i2c/i2cmux.c:1.5.8.1
--- src/sys/dev/i2c/i2cmux.c:1.5	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/i2cmux.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i2cmux.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: i2cmux.c,v 1.5.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i2cmux.c,v 1.5 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2cmux.c,v 1.5.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -201,7 +201,7 @@ iicmux_attach_bus(struct iicmux_softc * 
 			.iba_tag = &bus->controller,
 			.iba_child_devices = acpi_enter_i2c_devs(NULL, ad)
 		};
-		config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL);
+		config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
 	}	break;
 #endif
 	default:

Index: src/sys/dev/i2c/ihidev.c
diff -u src/sys/dev/i2c/ihidev.c:1.19 src/sys/dev/i2c/ihidev.c:1.19.8.1
--- src/sys/dev/i2c/ihidev.c:1.19	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/ihidev.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ihidev.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: ihidev.c,v 1.19.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 /* $OpenBSD ihidev.c,v 1.13 2017/04/08 02:57:23 deraadt Exp $ */
 
 /*-
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihidev.c,v 1.19.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -219,9 +219,8 @@ ihidev_attach(device_t parent, device_t 
 	iha.reportid = IHIDEV_CLAIM_ALLREPORTID;
 	locs[IHIDBUSCF_REPORTID] = IHIDEV_CLAIM_ALLREPORTID;
 	dev = config_found(self, &iha, ihidev_print,
-	    CFARG_SUBMATCH, ihidev_submatch,
-	    CFARG_LOCATORS, locs,
-	    CFARG_EOL);
+	    CFARGS(.submatch = ihidev_submatch,
+		   .locators = locs));
 	if (dev != NULL) {
 		for (repid = 0; repid < sc->sc_nrepid; repid++)
 			sc->sc_subdevs[repid] = device_private(dev);
@@ -240,9 +239,8 @@ ihidev_attach(device_t parent, device_t 
 		iha.reportid = repid;
 		locs[IHIDBUSCF_REPORTID] = repid;
 		dev = config_found(self, &iha, ihidev_print,
-		    CFARG_SUBMATCH, ihidev_submatch,
-		    CFARG_LOCATORS, locs,
-		    CFARG_EOL);
+		    CFARGS(.submatch = ihidev_submatch,
+			   .locators = locs));
 		sc->sc_subdevs[repid] = device_private(dev);
 	}
 
Index: src/sys/dev/i2c/tps65217pmic.c
diff -u src/sys/dev/i2c/tps65217pmic.c:1.19 src/sys/dev/i2c/tps65217pmic.c:1.19.8.1
--- src/sys/dev/i2c/tps65217pmic.c:1.19	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/tps65217pmic.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tps65217pmic.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $ */
+/*	$NetBSD: tps65217pmic.c,v 1.19.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #include "opt_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.19 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tps65217pmic.c,v 1.19.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -962,7 +962,7 @@ tps65217pmic_regulator_attach(struct tps
 
 		raa.reg_param = param;
 		raa.reg_phandle = child;
-		config_found(sc->sc_dev, &raa, NULL, CFARG_EOL);
+		config_found(sc->sc_dev, &raa, NULL, CFARGS_NONE);
 	}
 }
 

Index: src/sys/dev/i2c/motoi2c.c
diff -u src/sys/dev/i2c/motoi2c.c:1.11 src/sys/dev/i2c/motoi2c.c:1.11.8.1
--- src/sys/dev/i2c/motoi2c.c:1.11	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/motoi2c.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: motoi2c.c,v 1.11 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: motoi2c.c,v 1.11.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007, 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motoi2c.c,v 1.11 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motoi2c.c,v 1.11.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #if defined(__arm__) || defined(__aarch64__)
 #include "opt_fdt.h"
@@ -135,8 +135,7 @@ motoi2c_attach_common(device_t self, str
 	} else
 #endif
 	config_found(self, &iba, iicbus_print,
-	    CFARG_IATTR, "i2cbus",
-	    CFARG_EOL);
+	    CFARGS(.iattr = "i2cbus"));
 }
 
 static int

Index: src/sys/dev/i2c/rkpmic.c
diff -u src/sys/dev/i2c/rkpmic.c:1.13 src/sys/dev/i2c/rkpmic.c:1.13.8.1
--- src/sys/dev/i2c/rkpmic.c:1.13	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/rkpmic.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rkpmic.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: rkpmic.c,v 1.13.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.13 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rkpmic.c,v 1.13.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -525,7 +525,7 @@ rkpmic_attach(device_t parent, device_t 
 			continue;
 		raa.reg_ctrl = &sc->sc_conf->ctrl[n];
 		raa.reg_phandle = child;
-		config_found(self, &raa, NULL, CFARG_EOL);
+		config_found(self, &raa, NULL, CFARGS_NONE);
 	}
 }
 

Index: src/sys/dev/i2c/tcakp.c
diff -u src/sys/dev/i2c/tcakp.c:1.16 src/sys/dev/i2c/tcakp.c:1.16.8.1
--- src/sys/dev/i2c/tcakp.c:1.16	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/tcakp.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcakp.c,v 1.16 2021/04/24 23:36:54 thorpej Exp $ */
+/* $NetBSD: tcakp.c,v 1.16.8.1 2021/08/04 18:53:26 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_fdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.16 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcakp.c,v 1.16.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -416,7 +416,7 @@ tcakp_attach(device_t parent, device_t s
 	a.accessops = &tcakp_accessops;
 	a.accesscookie = sc;
 
-	sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL);
+	sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARGS_NONE);
 }
 
 static int

Index: src/sys/dev/i2c/w83795g.c
diff -u src/sys/dev/i2c/w83795g.c:1.4 src/sys/dev/i2c/w83795g.c:1.4.8.1
--- src/sys/dev/i2c/w83795g.c:1.4	Sat Apr 24 23:36:54 2021
+++ src/sys/dev/i2c/w83795g.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: w83795g.c,v 1.4 2021/04/24 23:36:54 thorpej Exp $	*/
+/*	$NetBSD: w83795g.c,v 1.4.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2013 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: w83795g.c,v 1.4 2021/04/24 23:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w83795g.c,v 1.4.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -263,7 +263,7 @@ w83795g_attach(device_t parent, device_t
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 
-	config_found(self, &gba, gpiobus_print, CFARG_EOL);
+	config_found(self, &gba, gpiobus_print, CFARGS_NONE);
 }
 
 static void

Index: src/sys/dev/i2o/iop.c
diff -u src/sys/dev/i2o/iop.c:1.91 src/sys/dev/i2o/iop.c:1.91.8.1
--- src/sys/dev/i2o/iop.c:1.91	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/i2o/iop.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: iop.c,v 1.91 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: iop.c,v 1.91.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.91 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.91.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include "iop.h"
 
@@ -584,9 +584,8 @@ iop_config_interrupts(device_t self)
 	ia.ia_tid = I2O_TID_IOP;
 	locs[IOPCF_TID] = I2O_TID_IOP;
 	config_found(self, &ia, iop_print,
-	    CFARG_SUBMATCH, config_stdsubmatch,
-	    CFARG_LOCATORS, locs,
-	    CFARG_EOL);
+	    CFARGS(.submatch = config_stdsubmatch,
+		   .locators = locs));
 
 	/*
 	 * Start device configuration.
@@ -817,9 +816,8 @@ iop_configure_devices(struct iop_softc *
 		locs[IOPCF_TID] = ia.ia_tid;
 
 		dv = config_found(sc->sc_dev, &ia, iop_print,
-		    CFARG_SUBMATCH, config_stdsubmatch,
-		    CFARG_LOCATORS, locs,
-		    CFARG_EOL);
+		    CFARGS(.submatch = config_stdsubmatch,
+			   .locators = locs));
 		if (dv != NULL) {
  			sc->sc_tidmap[i].it_flags |= IT_CONFIGURED;
 			strcpy(sc->sc_tidmap[i].it_dvname, device_xname(dv));

Index: src/sys/dev/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.39 src/sys/dev/i2o/iopsp.c:1.39.8.1
--- src/sys/dev/i2o/iopsp.c:1.39	Sat Apr 24 23:36:55 2021
+++ src/sys/dev/i2o/iopsp.c	Wed Aug  4 18:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: iopsp.c,v 1.39 2021/04/24 23:36:55 thorpej Exp $	*/
+/*	$NetBSD: iopsp.c,v 1.39.8.1 2021/08/04 18:53:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.39 2021/04/24 23:36:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.39.8.1 2021/08/04 18:53:26 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -199,7 +199,7 @@ iopsp_attach(device_t parent, device_t s
 		aprint_error_dev(sc->sc_dev, "configure failed\n");
 		goto bad;
 	}
-	config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL);
+	config_found(self, &sc->sc_channel, scsiprint, CFARGS_NONE);
 	return;
 
  bad:

Reply via email to