diff options
| author | thorpej <thorpej@NetBSD.org> | 2021-04-24 23:36:23 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2021-04-24 23:36:23 +0000 |
| commit | 3bee0c110b9ff2a9a0e2833be339e1c873af3a44 (patch) | |
| tree | 82c9f34b9867882723e76eff95e5d7ca6cab69bf /sys/arch/macppc/dev | |
| parent | e77b3a7c4b6598de68d8b78f86e7851410840595 (diff) | |
Merge thorpej-cfargs branch:
Simplify and make extensible the config_search() / config_found() /
config_attach() interfaces: rather than having different variants for
which arguments you want pass along, just have a single call that
takes a variadic list of tag-value arguments.
Adjust all call sites:
- Simplify wherever possible; don't pass along arguments that aren't
actually needed.
- Don't be explicit about what interface attribute is attaching if
the device only has one. (More simplification.)
- Add a config_probe() function to be used in indirect configuiration
situations, making is visibly easier to see when indirect config is
in play, and allowing for future change in semantics. (As of now,
this is just a wrapper around config_match(), but that is an
implementation detail.)
Remove unnecessary or redundant interface attributes where they're not
needed.
There are currently 5 "cfargs" defined:
- CFARG_SUBMATCH (submatch function for direct config)
- CFARG_SEARCH (search function for indirect config)
- CFARG_IATTR (interface attribte)
- CFARG_LOCATORS (locators array)
- CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)
...and a sentinel value CFARG_EOL.
Add some extra sanity checking to ensure that interface attributes
aren't ambiguous.
Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark
ports to associate those device handles with device_t instance. This
will trickle trough to more places over time (need back-end for pre-OFW
Sun OBP; any others?).
Diffstat (limited to 'sys/arch/macppc/dev')
| -rw-r--r-- | sys/arch/macppc/dev/adb.c | 10 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/akbd.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/ams.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/cuda.c | 15 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/gpio.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/ki2c.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/mediabay.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/mesh.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/obio.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/ofb.c | 12 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/pbms.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/platinumfb.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/pmu.c | 22 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/smu.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/smuiic.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/snapper.c | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/uni-n.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/valkyriefb.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/zs.c | 7 |
19 files changed, 87 insertions, 62 deletions
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index b3dfbbc1330..7a745491ed0 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $NetBSD: adb.c,v 1.35 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (C) 1994 Bradley A. Grantham @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.35 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.36 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -150,7 +150,7 @@ adbattach(device_t parent, device_t self, void *aux) aa_args.adbaddr = ADBADDR_APM; aa_args.handler_id = ADBADDR_APM; - (void)config_found(self, &aa_args, NULL); + (void)config_found(self, &aa_args, NULL, CFARG_EOL); #endif /* @@ -174,7 +174,7 @@ adbattach(device_t parent, device_t self, void *aux) aa_args.origaddr = 0; aa_args.adbaddr = 0; aa_args.handler_id = 0; - (void)config_found(self, &aa_args, adbprint); + (void)config_found(self, &aa_args, adbprint, CFARG_EOL); #endif /* for each ADB device */ @@ -186,7 +186,7 @@ adbattach(device_t parent, device_t self, void *aux) aa_args.adbaddr = adbaddr; aa_args.handler_id = adbdata.devType; - (void)config_found(self, &aa_args, adbprint); + (void)config_found(self, &aa_args, adbprint, CFARG_EOL); } if (adbHardware == ADB_HW_CUDA) diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c index b6e48bb3494..fd5eb328ca1 100644 --- a/sys/arch/macppc/dev/akbd.c +++ b/sys/arch/macppc/dev/akbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: akbd.c,v 1.45 2012/10/27 17:18:00 chs Exp $ */ +/* $NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.45 2012/10/27 17:18:00 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.46 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -250,7 +250,7 @@ akbdattach(device_t parent, device_t self, void *aux) a.accessops = &akbd_accessops; a.accesscookie = sc; - sc->sc_wskbddev = config_found(self, &a, wskbddevprint); + sc->sc_wskbddev = config_found(self, &a, wskbddevprint, CFARG_EOL); } diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c index ea7779e2e8d..45b6e3daf2f 100644 --- a/sys/arch/macppc/dev/ams.c +++ b/sys/arch/macppc/dev/ams.c @@ -1,4 +1,4 @@ -/* $NetBSD: ams.c,v 1.29 2012/10/27 17:18:00 chs Exp $ */ +/* $NetBSD: ams.c,v 1.30 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.29 2012/10/27 17:18:00 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.30 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -199,7 +199,7 @@ amsattach(device_t parent, device_t self, void *aux) a.accessops = &ams_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); } diff --git a/sys/arch/macppc/dev/cuda.c b/sys/arch/macppc/dev/cuda.c index 7ff77be3c79..e7caebf2d5c 100644 --- a/sys/arch/macppc/dev/cuda.c +++ b/sys/arch/macppc/dev/cuda.c @@ -1,4 +1,4 @@ -/* $NetBSD: cuda.c,v 1.27 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: cuda.c,v 1.28 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.27 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.28 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -232,8 +232,9 @@ cuda_attach(device_t parent, device_t self, void *aux) sc->sc_adbops.poll = cuda_adb_poll; sc->sc_adbops.autopoll = cuda_autopoll; sc->sc_adbops.set_handler = cuda_adb_set_handler; - config_found_ia(self, "adb_bus", &sc->sc_adbops, - nadb_print); + config_found(self, &sc->sc_adbops, nadb_print, + CFARG_IATTR, "adb_bus", + CFARG_EOL); } else if (strncmp(name, "rtc", 4) == 0) { sc->sc_todr.todr_gettime = cuda_todr_get; @@ -249,7 +250,7 @@ cuda_attach(device_t parent, device_t self, void *aux) caa.send = cuda_send; caa.poll = cuda_poll; #if notyet - config_found(self, &caa, cuda_print); + config_found(self, &caa, cuda_print, CFARG_EOL); #endif cfg = prop_array_create(); prop_dictionary_set(dict, "i2c-child-devices", cfg); @@ -280,7 +281,9 @@ cuda_attach(device_t parent, device_t self, void *aux) iic_tag_init(&sc->sc_i2c); sc->sc_i2c.ic_cookie = sc; sc->sc_i2c.ic_exec = cuda_i2c_exec; - config_found_ia(self, "i2cbus", &iba, iicbus_print); + config_found(self, &iba, iicbus_print, + CFARG_IATTR, "i2cbus", + CFARG_EOL); if (cuda0 == NULL) cuda0 = &caa; diff --git a/sys/arch/macppc/dev/gpio.c b/sys/arch/macppc/dev/gpio.c index 698c6234255..0c2f0a65e82 100644 --- a/sys/arch/macppc/dev/gpio.c +++ b/sys/arch/macppc/dev/gpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.13 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: gpio.c,v 1.14 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (C) 1998 Internet Research Institute, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.13 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.14 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -119,7 +119,9 @@ gpio_obio_attach(device_t parent, device_t self, void *aux) ca2.ca_reg = reg; ca2.ca_intr = intr; - config_found(self, &ca2, gpio_obio_print); + config_found(self, &ca2, gpio_obio_print, + CFARG_DEVHANDLE, devhandle_from_of(child), + CFARG_EOL); } } diff --git a/sys/arch/macppc/dev/ki2c.c b/sys/arch/macppc/dev/ki2c.c index b33f48cecb0..9fd6e5c0af4 100644 --- a/sys/arch/macppc/dev/ki2c.c +++ b/sys/arch/macppc/dev/ki2c.c @@ -1,4 +1,4 @@ -/* $NetBSD: ki2c.c,v 1.30 2020/06/12 06:44:57 macallan Exp $ */ +/* $NetBSD: ki2c.c,v 1.31 2021/04/24 23:36:41 thorpej Exp $ */ /* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */ /*- @@ -205,7 +205,7 @@ ki2c_attach(device_t parent, device_t self, void *aux) memset(&iba, 0, sizeof(iba)); iba.iba_tag = &sc->sc_i2c; - (void) config_found_ia(sc->sc_dev, "i2cbus", &iba, iicbus_print); + config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL); } diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c index 20760470441..e4d3becfcb1 100644 --- a/sys/arch/macppc/dev/mediabay.c +++ b/sys/arch/macppc/dev/mediabay.c @@ -1,4 +1,4 @@ -/* $NetBSD: mediabay.c,v 1.24 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: mediabay.c,v 1.25 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (C) 1999 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.24 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.25 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -243,7 +243,9 @@ mediabay_attach_content(struct mediabay_softc *sc) ca.ca_reg = reg; ca.ca_intr = intr; - content = config_found(sc->sc_dev, &ca, mediabay_print); + content = config_found(sc->sc_dev, &ca, mediabay_print, + CFARG_DEVHANDLE, devhandle_from_of(child), + CFARG_EOL); if (content) { sc->sc_content = content; return; diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c index b276e091699..22a37f657fe 100644 --- a/sys/arch/macppc/dev/mesh.c +++ b/sys/arch/macppc/dev/mesh.c @@ -1,4 +1,4 @@ -/* $NetBSD: mesh.c,v 1.40 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: mesh.c,v 1.41 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.40 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.41 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -259,7 +259,7 @@ mesh_attach(device_t parent, device_t self, void *aux) sc->sc_channel.chan_nluns = 8; sc->sc_channel.chan_id = sc->sc_id; - config_found(self, &sc->sc_channel, scsiprint); + config_found(self, &sc->sc_channel, scsiprint, CFARG_EOL); intr_establish_xname(sc->sc_irq, IST_EDGE, IPL_BIO, mesh_intr, sc, device_xname(self)); diff --git a/sys/arch/macppc/dev/obio.c b/sys/arch/macppc/dev/obio.c index 3cbd2e73573..4483a0222fe 100644 --- a/sys/arch/macppc/dev/obio.c +++ b/sys/arch/macppc/dev/obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.48 2021/01/26 14:49:41 thorpej Exp $ */ +/* $NetBSD: obio.c,v 1.49 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (C) 1998 Internet Research Institute, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.48 2021/01/26 14:49:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.49 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -271,7 +271,9 @@ obio_attach(device_t parent, device_t self, void *aux) ca.ca_reg = reg; ca.ca_intr = intr; - config_found(self, &ca, obio_print); + config_found(self, &ca, obio_print, + CFARG_DEVHANDLE, devhandle_from_of(child), + CFARG_EOL); } } diff --git a/sys/arch/macppc/dev/ofb.c b/sys/arch/macppc/dev/ofb.c index cc1f4d8f5dd..6b7bf7c1743 100644 --- a/sys/arch/macppc/dev/ofb.c +++ b/sys/arch/macppc/dev/ofb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofb.c,v 1.70 2016/05/23 01:45:41 chs Exp $ */ +/* $NetBSD: ofb.c,v 1.71 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.70 2016/05/23 01:45:41 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.71 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -217,9 +217,13 @@ ofbattach(device_t parent, device_t self, void *aux) a.accessops = &ofb_accessops; a.accesscookie = &sc->vd; - config_found(self, &a, wsemuldisplaydevprint); + config_found(self, &a, wsemuldisplaydevprint, + CFARG_IATTR, "wsemuldisplaydev", + CFARG_EOL); - config_found_ia(self, "drm", aux, ofb_drm_print); + config_found(self, aux, ofb_drm_print, + CFARG_IATTR, "drm", + CFARG_EOL); } static int diff --git a/sys/arch/macppc/dev/pbms.c b/sys/arch/macppc/dev/pbms.c index 3e6ccb015b8..f26d940dabe 100644 --- a/sys/arch/macppc/dev/pbms.c +++ b/sys/arch/macppc/dev/pbms.c @@ -1,4 +1,4 @@ -/* $Id: pbms.c,v 1.16 2018/09/03 16:29:25 riastradh Exp $ */ +/* $Id: pbms.c,v 1.17 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -373,7 +373,7 @@ pbms_attach(device_t parent, device_t self, void *aux) a.accessops = &pbms_accessops; a.accesscookie = sc; - sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint); + sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint, CFARG_EOL); return; } diff --git a/sys/arch/macppc/dev/platinumfb.c b/sys/arch/macppc/dev/platinumfb.c index 6d1f853f00d..b0097d896fd 100644 --- a/sys/arch/macppc/dev/platinumfb.c +++ b/sys/arch/macppc/dev/platinumfb.c @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.4 2019/12/11 21:04:47 scole Exp $"); +__KERNEL_RCSID(0, "$NetBSD: platinumfb.c,v 1.5 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -643,7 +643,7 @@ platinumfb_init(device_t self) aa.accessops = &platinumfb_accessops; aa.accesscookie = &sc->vd; - config_found(self, &aa, wsemuldisplaydevprint); + config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); return 0; } diff --git a/sys/arch/macppc/dev/pmu.c b/sys/arch/macppc/dev/pmu.c index 45d84484dde..141f487f7f8 100644 --- a/sys/arch/macppc/dev/pmu.c +++ b/sys/arch/macppc/dev/pmu.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmu.c,v 1.36 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: pmu.c,v 1.37 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.36 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.37 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -382,8 +382,9 @@ pmu_attach(device_t parent, device_t self, void *aux) iic_tag_init(&sc->sc_i2c); sc->sc_i2c.ic_cookie = sc; sc->sc_i2c.ic_exec = pmu_i2c_exec; - config_found_ia(sc->sc_dev, "i2cbus", &iba, - iicbus_print); + config_found(sc->sc_dev, &iba, iicbus_print, + CFARG_IATTR, "i2cbus", + CFARG_EOL); goto next; } if (strncmp(name, "adb", 4) == 0) { @@ -394,8 +395,9 @@ pmu_attach(device_t parent, device_t self, void *aux) sc->sc_adbops.autopoll = pmu_autopoll; sc->sc_adbops.set_handler = pmu_adb_set_handler; #if NNADB > 0 - config_found_ia(self, "adb_bus", &sc->sc_adbops, - nadb_print); + config_found(self, &sc->sc_adbops, nadb_print, + CFARG_IATTR, "adb_bus", + CFARG_EOL); #endif goto next; } @@ -1095,7 +1097,9 @@ pmu_attach_legacy_battery(struct pmu_softc *sc) baa.baa_type = BATTERY_TYPE_LEGACY; baa.baa_pmu_ops = &sc->sc_pmu_ops; - config_found_ia(sc->sc_dev, "pmu_bus", &baa, pmu_print); + config_found(sc->sc_dev, &baa, pmu_print, + CFARG_IATTR, "pmu_bus", + CFARG_EOL); } static void @@ -1106,5 +1110,7 @@ pmu_attach_smart_battery(struct pmu_softc *sc, int num) baa.baa_type = BATTERY_TYPE_SMART; baa.baa_pmu_ops = &sc->sc_pmu_ops; baa.baa_num = num; - config_found_ia(sc->sc_dev, "pmu_bus", &baa, pmu_print); + config_found(sc->sc_dev, &baa, pmu_print, + CFARG_IATTR, "pmu_bus", + CFARG_EOL); } diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c index 5370475a141..3097f20dab3 100644 --- a/sys/arch/macppc/dev/smu.c +++ b/sys/arch/macppc/dev/smu.c @@ -477,7 +477,9 @@ smu_setup_iicbus(struct smu_softc *sc) ca.ca_name = name; ca.ca_node = node; ca.ca_tag = i2c; - config_found_ia(sc->sc_dev, "smu", &ca, smu_iicbus_print); + config_found(sc->sc_dev, &ca, smu_iicbus_print, + CFARG_DEVHANDLE, devhandle_from_of(node), + CFARG_EOL); sc->sc_num_iicbus++; } diff --git a/sys/arch/macppc/dev/smuiic.c b/sys/arch/macppc/dev/smuiic.c index 9ce37961529..854224a77b9 100644 --- a/sys/arch/macppc/dev/smuiic.c +++ b/sys/arch/macppc/dev/smuiic.c @@ -1,4 +1,4 @@ -/* $NetBSD: smuiic.c,v 1.6 2021/02/25 20:51:10 macallan Exp $ */ +/* $NetBSD: smuiic.c,v 1.7 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (c) 2013 Phileas Fogg @@ -131,5 +131,5 @@ smuiic_attach(device_t parent, device_t self, void *aux) memset(&iba, 0, sizeof(iba)); iba.iba_tag = sc->sc_i2c; - config_found_ia(sc->sc_dev, "i2cbus", &iba, iicbus_print); + config_found(sc->sc_dev, &iba, iicbus_print, CFARG_EOL); } diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c index 98d9f918c59..8829ef76869 100644 --- a/sys/arch/macppc/dev/snapper.c +++ b/sys/arch/macppc/dev/snapper.c @@ -1,4 +1,4 @@ -/* $NetBSD: snapper.c,v 1.57 2021/03/11 19:36:11 macallan Exp $ */ +/* $NetBSD: snapper.c,v 1.58 2021/04/24 23:36:41 thorpej Exp $ */ /* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */ /* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.57 2021/03/11 19:36:11 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.58 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -2300,7 +2300,8 @@ snapper_setup_ow(struct snapper_softc *sc) memset(&oba, 0, sizeof(oba)); oba.oba_bus = &sc->sc_ow_bus; - sc->sc_ow_dev = config_found(sc->sc_dev, &oba, onewirebus_print); + sc->sc_ow_dev = config_found(sc->sc_dev, &oba, onewirebus_print, + CFARG_EOL); } diff --git a/sys/arch/macppc/dev/uni-n.c b/sys/arch/macppc/dev/uni-n.c index cb2b144cd52..c8c2ab5b088 100644 --- a/sys/arch/macppc/dev/uni-n.c +++ b/sys/arch/macppc/dev/uni-n.c @@ -1,4 +1,4 @@ -/* $NetBSD: uni-n.c,v 1.9 2018/03/16 22:08:53 macallan Exp $ */ +/* $NetBSD: uni-n.c,v 1.10 2021/04/24 23:36:41 thorpej Exp $ */ /*- * Copyright (C) 2005 Michael Lorenz. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.9 2018/03/16 22:08:53 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uni-n.c,v 1.10 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -149,7 +149,9 @@ uni_n_attach(device_t parent, device_t self, void *aux) ca.ca_reg = reg; ca.ca_intr = intr; - config_found(self, &ca, uni_n_print); + config_found(self, &ca, uni_n_print, + CFARG_DEVHANDLE, devhandle_from_of(child), + CFARG_EOL); } } diff --git a/sys/arch/macppc/dev/valkyriefb.c b/sys/arch/macppc/dev/valkyriefb.c index 16f180e5f6d..921a1d28399 100644 --- a/sys/arch/macppc/dev/valkyriefb.c +++ b/sys/arch/macppc/dev/valkyriefb.c @@ -1,4 +1,4 @@ -/* $NetBSD: valkyriefb.c,v 1.5 2018/02/16 18:13:47 macallan Exp $ */ +/* $NetBSD: valkyriefb.c,v 1.6 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (c) 2012 Michael Lorenz @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.5 2018/02/16 18:13:47 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.6 2021/04/24 23:36:41 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -262,7 +262,7 @@ valkyriefb_init(device_t self) aa.accessops = &valkyriefb_accessops; aa.accesscookie = &sc->vd; - config_found(self, &aa, wsemuldisplaydevprint); + config_found(self, &aa, wsemuldisplaydevprint, CFARG_EOL); return 0; } diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c index d62adf16a3b..4f14dc6b9f8 100644 --- a/sys/arch/macppc/dev/zs.c +++ b/sys/arch/macppc/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.51 2021/03/05 07:15:53 rin Exp $ */ +/* $NetBSD: zs.c,v 1.52 2021/04/24 23:36:41 thorpej Exp $ */ /* * Copyright (c) 1996, 1998 Bill Studenmund @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.51 2021/03/05 07:15:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.52 2021/04/24 23:36:41 thorpej Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -367,7 +367,8 @@ zsc_attach(device_t parent, device_t self, void *aux) * Look for a child driver for this channel. * The child attach will setup the hardware. */ - if (!config_found(self, (void *)&zsc_args, zsc_print)) { + if (!config_found(self, (void *)&zsc_args, zsc_print, + CFARG_EOL)) { /* No sub-driver. Just reset it. */ uint8_t reset = (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET; |
