Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/thorpej-cfargs]: src/sys CFARG_SUBMATCH -> CFARG_SEARCH for the indirect...



details:   https://anonhg.NetBSD.org/src/rev/042f4f0840d1
branches:  thorpej-cfargs
changeset: 960499:042f4f0840d1
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Apr 04 22:01:12 2021 +0000

description:
CFARG_SUBMATCH -> CFARG_SEARCH for the indirect configuration uses.

diffstat:

 sys/arch/acorn32/eb7500atx/rsbus.c           |   6 +++---
 sys/arch/acorn32/mainbus/pioc.c              |   6 +++---
 sys/arch/amiga/clockport/clockport.c         |   8 ++++----
 sys/arch/arm/at91/at91bus.c                  |   6 +++---
 sys/arch/arm/at91/at91pio.c                  |   8 ++++----
 sys/arch/arm/ep93xx/epgpio.c                 |   6 +++---
 sys/arch/arm/ep93xx/epsoc.c                  |   6 +++---
 sys/arch/arm/gemini/gemini_lpc.c             |   6 +++---
 sys/arch/arm/gemini/gemini_obio.c            |   6 +++---
 sys/arch/arm/imx/imx23_ahb.c                 |   4 ++--
 sys/arch/arm/imx/imx23_apbh.c                |   6 +++---
 sys/arch/arm/imx/imx23_apbx.c                |   6 +++---
 sys/arch/arm/imx/imx23_usb.c                 |   4 ++--
 sys/arch/arm/imx/imx31_ahb.c                 |   6 +++---
 sys/arch/arm/imx/imx31_aips.c                |   8 ++++----
 sys/arch/arm/imx/imx51_axi.c                 |   8 ++++----
 sys/arch/arm/imx/imx51_usb.c                 |   6 +++---
 sys/arch/arm/iomd/vidc20.c                   |   6 +++---
 sys/arch/arm/ixp12x0/ixpsip.c                |   6 +++---
 sys/arch/arm/mainbus/mainbus.c               |   6 +++---
 sys/arch/arm/mpcore/mpcore_axi.c             |   8 ++++----
 sys/arch/arm/mpcore/mpcore_pmr.c             |   6 +++---
 sys/arch/arm/omap/omap2_gpmc.c               |   8 ++++----
 sys/arch/arm/omap/omap2_l3i.c                |   8 ++++----
 sys/arch/arm/omap/omap2_obio.c               |   8 ++++----
 sys/arch/arm/omap/omap_emifs.c               |   6 +++---
 sys/arch/arm/omap/omap_ocp.c                 |   6 +++---
 sys/arch/arm/omap/omap_tipb.c                |   8 ++++----
 sys/arch/arm/omap/omapl1x_tipb.c             |   6 +++---
 sys/arch/arm/s3c2xx0/s3c2410.c               |   6 +++---
 sys/arch/arm/s3c2xx0/s3c2410_extint.c        |   6 +++---
 sys/arch/arm/s3c2xx0/s3c2410_spi.c           |   6 +++---
 sys/arch/arm/s3c2xx0/s3c2440.c               |   4 ++--
 sys/arch/arm/s3c2xx0/s3c2440_extint.c        |   4 ++--
 sys/arch/arm/s3c2xx0/s3c2440_i2s.c           |   2 +-
 sys/arch/arm/s3c2xx0/s3c2440_spi.c           |   4 ++--
 sys/arch/arm/s3c2xx0/s3c2800.c               |   6 +++---
 sys/arch/arm/sa11x0/sa11x0.c                 |   6 +++---
 sys/arch/arm/xscale/becc.c                   |   6 +++---
 sys/arch/arm/xscale/ixp425_ixme.c            |   6 +++---
 sys/arch/arm/xscale/ixp425_npe.c             |   6 +++---
 sys/arch/arm/xscale/ixp425_sip.c             |   6 +++---
 sys/arch/arm/xscale/pxa2x0.c                 |   6 +++---
 sys/arch/arm/zynq/zynq_axi.c                 |   8 ++++----
 sys/arch/atari/vme/vme.c                     |   6 +++---
 sys/arch/cesfic/cesfic/autoconf.c            |   6 +++---
 sys/arch/cobalt/cobalt/mainbus.c             |   6 +++---
 sys/arch/dreamcast/dev/g1/g1bus.c            |   6 +++---
 sys/arch/dreamcast/dev/g2/g2bus.c            |   6 +++---
 sys/arch/epoc32/epoc32/external.c            |   6 +++---
 sys/arch/epoc32/epoc32/internal.c            |   6 +++---
 sys/arch/evbarm/adi_brh/obio.c               |   6 +++---
 sys/arch/evbarm/g42xxeb/gb225.c              |   4 ++--
 sys/arch/evbarm/g42xxeb/obio.c               |   4 ++--
 sys/arch/evbarm/gumstix/gxio.c               |   6 +++---
 sys/arch/evbarm/hdl_g/obio.c                 |   6 +++---
 sys/arch/evbarm/ifpga/ifpga.c                |   6 +++---
 sys/arch/evbarm/iq80310/obio.c               |   6 +++---
 sys/arch/evbarm/iq80321/obio.c               |   6 +++---
 sys/arch/evbarm/iyonix/obio.c                |   6 +++---
 sys/arch/evbarm/lubbock/obio.c               |   6 +++---
 sys/arch/evbarm/lubbock/sacc_obio.c          |   6 +++---
 sys/arch/evbarm/tsarm/tspld.c                |   6 +++---
 sys/arch/evbsh3/evbsh3/mainbus.c             |   6 +++---
 sys/arch/hp300/dev/hpib.c                    |   6 +++---
 sys/arch/hp300/hp300/autoconf.c              |   6 +++---
 sys/arch/hpcarm/dev/ipaq_atmelgpio.c         |   6 +++---
 sys/arch/hpcarm/dev/ipaq_saip.c              |   6 +++---
 sys/arch/hpcarm/dev/j720ssp.c                |   6 +++---
 sys/arch/hpcarm/dev/nbppcon.c                |   6 +++---
 sys/arch/hpcarm/dev/sacc_hpcarm.c            |   6 +++---
 sys/arch/hpcarm/dev/uda1341.c                |   6 +++---
 sys/arch/hpcmips/dev/plum.c                  |   8 ++++----
 sys/arch/hpcmips/dev/plumiobus.c             |   6 +++---
 sys/arch/hpcmips/dev/ucb1200.c               |   6 +++---
 sys/arch/hpcmips/hpcmips/mainbus.c           |   6 +++---
 sys/arch/hpcmips/tx/tx39sib.c                |   6 +++---
 sys/arch/hpcmips/tx/tx39spi.c                |   6 +++---
 sys/arch/hpcmips/tx/tx39uart.c               |   6 +++---
 sys/arch/hpcmips/tx/txcsbus.c                |   8 ++++----
 sys/arch/hpcmips/tx/txsim.c                  |  10 +++++-----
 sys/arch/hpcmips/vr/vrc4173bcu.c             |   6 +++---
 sys/arch/hpcmips/vr/vrip.c                   |   8 ++++----
 sys/arch/hpcsh/hpcsh/mainbus.c               |   6 +++---
 sys/arch/iyonix/iyonix/obio.c                |   6 +++---
 sys/arch/landisk/dev/obio.c                  |   6 +++---
 sys/arch/mac68k/mac68k/mainbus.c             |   6 +++---
 sys/arch/mac68k/obio/obio.c                  |   6 +++---
 sys/arch/mips/ralink/ralink_mainbus.c        |   6 +++---
 sys/arch/mips/rmi/rmixl_iobus.c              |   6 +++---
 sys/arch/mips/rmi/rmixl_mainbus.c            |   6 +++---
 sys/arch/mips/rmi/rmixl_obio.c               |   6 +++---
 sys/arch/mips/rmi/rmixl_usbi.c               |   6 +++---
 sys/arch/mips/sibyte/dev/sbgbus.c            |   6 +++---
 sys/arch/mipsco/obio/obio.c                  |   6 +++---
 sys/arch/mmeye/mmeye/mainbus.c               |   6 +++---
 sys/arch/news68k/dev/hb.c                    |   6 +++---
 sys/arch/news68k/news68k/mainbus.c           |   6 +++---
 sys/arch/newsmips/dev/hb.c                   |   6 +++---
 sys/arch/next68k/dev/intio.c                 |   6 +++---
 sys/arch/next68k/next68k/mainbus.c           |   6 +++---
 sys/arch/playstation2/dev/sbus.c             |   6 +++---
 sys/arch/playstation2/playstation2/mainbus.c |   6 +++---
 sys/arch/powerpc/booke/dev/pq3obio.c         |   6 +++---
 sys/arch/prep/pnpbus/pnpbus.c                |   6 +++---
 sys/arch/rs6000/mca/ioplanar.c               |   4 ++--
 sys/arch/sandpoint/sandpoint/eumb.c          |   6 +++---
 sys/arch/sgimips/gio/gio.c                   |   6 +++---
 sys/arch/sgimips/ioc/ioc.c                   |   6 +++---
 sys/arch/sgimips/mace/mace.c                 |   6 +++---
 sys/arch/sgimips/sgimips/mainbus.c           |   6 +++---
 sys/arch/sh3/dev/adc.c                       |   6 +++---
 sys/arch/sh3/dev/shb.c                       |   6 +++---
 sys/arch/sparc/dev/obio.c                    |   8 ++++----
 sys/arch/sun2/sun2/mbio.c                    |   8 ++++----
 sys/arch/sun2/sun2/mbmem.c                   |   8 ++++----
 sys/arch/sun2/sun2/obio.c                    |   8 ++++----
 sys/arch/sun2/sun2/obmem.c                   |   8 ++++----
 sys/arch/sun3/sun3/obmem.c                   |   6 +++---
 sys/arch/sun3/sun3/vme.c                     |   6 +++---
 sys/arch/sun3/sun3x/vme.c                    |   6 +++---
 sys/arch/vax/vsa/vsbus.c                     |   6 +++---
 sys/arch/x68k/dev/grf_machdep.c              |   6 +++---
 sys/arch/x68k/dev/intio.c                    |   6 +++---
 sys/arch/x68k/dev/mfp.c                      |   6 +++---
 sys/arch/x86/pci/amdnb_misc.c                |   8 ++++----
 sys/arch/x86/pci/amdpcib.c                   |   6 +++---
 sys/arch/x86/pci/amdsmn.c                    |   6 +++---
 sys/arch/zaurus/dev/zssp.c                   |   6 +++---
 sys/dev/audio/audio.c                        |   6 +++---
 sys/dev/gpib/cs80bus.c                       |   6 +++---
 sys/dev/gpib/gpib.c                          |   8 ++++----
 sys/dev/gpio/gpio.c                          |   6 +++---
 sys/dev/hpc/hpcioman.c                       |   6 +++---
 sys/dev/i2c/i2c.c                            |   6 +++---
 sys/dev/ic/apple_smc.c                       |   6 +++---
 sys/dev/isa/isa.c                            |   6 +++---
 sys/dev/isa/pcppi.c                          |   6 +++---
 sys/dev/isa/tsdio.c                          |   6 +++---
 sys/dev/isa/wbsio.c                          |   6 +++---
 sys/dev/marvell/obio.c                       |   6 +++---
 sys/dev/nand/nand.c                          |   6 +++---
 sys/dev/nor/nor.c                            |   6 +++---
 sys/dev/ppbus/ppbus_conf.c                   |   6 +++---
 sys/dev/qbus/uba.c                           |   6 +++---
 sys/dev/spi/spi.c                            |   6 +++---
 sys/dev/vme/vme.c                            |   8 ++++----
 sys/rump/librump/rumpkern/rump_autoconf.c    |   6 +++---
 148 files changed, 457 insertions(+), 457 deletions(-)

diffs (truncated from 4055 to 300 lines):

diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/acorn32/eb7500atx/rsbus.c
--- a/sys/arch/acorn32/eb7500atx/rsbus.c        Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c        Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.10.52.3 2021/04/03 01:57:08 thorpej Exp $ */
+/* $NetBSD: rsbus.c,v 1.10.52.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.3 2021/04/03 01:57:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.4 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,7 @@
         *  Attach each devices
         */
        config_search(self, NULL,
-           CFARG_SUBMATCH, rsbus_search,
+           CFARG_SEARCH, rsbus_search,
            CFARG_EOL);
 }
 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c   Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c   Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pioc.c,v 1.18.52.5 2021/04/03 01:57:08 thorpej Exp $   */     
+/*     $NetBSD: pioc.c,v 1.18.52.6 2021/04/04 22:01:12 thorpej Exp $   */     
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
 /*#define PIOC_DEBUG*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18.52.5 2021/04/03 01:57:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18.52.6 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -499,7 +499,7 @@
 
 #if 0
        config_search(self, NULL,
-           CFARG_SUBMATCH, piocsearch,
+           CFARG_SEARCH, piocsearch,
            CFARG_EOL);
 #endif
 }
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/amiga/clockport/clockport.c
--- a/sys/arch/amiga/clockport/clockport.c      Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/amiga/clockport/clockport.c      Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockport.c,v 1.5.52.3 2021/04/03 01:57:08 thorpej Exp $ */
+/*      $NetBSD: clockport.c,v 1.5.52.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 static int     clockport_match(device_t, cfdata_t , void *);
 static void    clockport_attach(device_t, device_t, void *);
 static int     clockport_print(void *, const char *);
-static int     clockport_submatch(device_t, cfdata_t, const int *, void *);
+static int     clockport_search(device_t, cfdata_t, const int *, void *);
 
 CFATTACH_DECL_NEW(clockport, sizeof(struct clockportbus_softc),
     clockport_match, clockport_attach, NULL, NULL);
@@ -66,12 +66,12 @@
        sc->cpb_aa = (struct clockportbus_attach_args *) aux;
 
        config_search(self, NULL,
-           CFARG_SUBMATCH, clockport_submatch,
+           CFARG_SEARCH, clockport_search,
            CFARG_EOL);
 }
 
 static int
-clockport_submatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
+clockport_search(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
 {
        struct clockportbus_softc *sc;
        struct clockport_attach_args a; 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c       Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/at91/at91bus.c       Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: at91bus.c,v 1.27.4.5 2021/04/03 01:57:08 thorpej Exp $ */
+/*     $NetBSD: at91bus.c,v 1.27.4.6 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27.4.5 2021/04/03 01:57:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27.4.6 2021/04/04 22:01:12 thorpej Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -623,7 +623,7 @@
        sa.sa_iot = sc->sc_iot;
        sa.sa_dmat = sc->sc_dmat;
        config_search(self, &sa,
-           CFARG_SUBMATCH, at91bus_search,
+           CFARG_SEARCH, at91bus_search,
            CFARG_EOL);
 }
 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/at91/at91pio.c
--- a/sys/arch/arm/at91/at91pio.c       Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/at91/at91pio.c       Sun Apr 04 22:01:12 2021 +0000
@@ -1,5 +1,5 @@
-/*     $Id: at91pio.c,v 1.6.52.3 2021/04/03 01:57:08 thorpej Exp $     */
-/*     $NetBSD: at91pio.c,v 1.6.52.3 2021/04/03 01:57:08 thorpej Exp $ */
+/*     $Id: at91pio.c,v 1.6.52.4 2021/04/04 22:01:12 thorpej Exp $     */
+/*     $NetBSD: at91pio.c,v 1.6.52.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.6.52.3 2021/04/03 01:57:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.6.52.4 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -190,7 +190,7 @@
 
        /* attach device */
        config_search(self, NULL,
-           CFARG_SUBMATCH, at91pio_search,
+           CFARG_SEARCH, at91pio_search,
            CFARG_IATTR, "at91pio",
            CFARG_EOL);
 }
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/ep93xx/epgpio.c
--- a/sys/arch/arm/ep93xx/epgpio.c      Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/ep93xx/epgpio.c      Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epgpio.c,v 1.5.52.3 2021/04/03 01:57:09 thorpej Exp $  */
+/*     $NetBSD: epgpio.c,v 1.5.52.4 2021/04/04 22:01:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.5.52.3 2021/04/03 01:57:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.5.52.4 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -317,7 +317,7 @@
 #endif
 
        config_search(self, NULL,
-           CFARG_SUBMATCH, epgpio_search,
+           CFARG_SEARCH, epgpio_search,
            CFARG_IATTR, "epgpio",
            CFARG_EOL);
 }
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/ep93xx/epsoc.c
--- a/sys/arch/arm/ep93xx/epsoc.c       Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/ep93xx/epsoc.c       Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epsoc.c,v 1.13.52.5 2021/04/03 01:57:09 thorpej Exp $  */
+/*     $NetBSD: epsoc.c,v 1.13.52.6 2021/04/04 22:01:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.13.52.5 2021/04/03 01:57:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.13.52.6 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -178,7 +178,7 @@
                         CFARG_EOL));
 
        config_search(self, &sa,
-           CFARG_SUBMATCH, epsoc_search,
+           CFARG_SEARCH, epsoc_search,
            CFARG_EOL);
 }
 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/gemini/gemini_lpc.c
--- a/sys/arch/arm/gemini/gemini_lpc.c  Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/gemini/gemini_lpc.c  Sun Apr 04 22:01:12 2021 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: gemini_lpc.c,v 1.4.52.3 2021/04/03 01:57:09 thorpej Exp $      */
+/*     $NetBSD: gemini_lpc.c,v 1.4.52.4 2021/04/04 22:01:12 thorpej Exp $      */
 
 #include "opt_gemini.h"
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.3 2021/04/03 01:57:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.4 2021/04/04 22:01:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,7 +113,7 @@
         * attach the rest of our devices
         */
        config_search(self, NULL,
-           CFARG_SUBMATCH, gemini_lpc_search,
+           CFARG_SEARCH, gemini_lpc_search,
            CFARG_EOL);
 }
 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/gemini/gemini_obio.c
--- a/sys/arch/arm/gemini/gemini_obio.c Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/gemini/gemini_obio.c Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_obio.c,v 1.10.68.3 2021/04/03 01:57:09 thorpej Exp $    */
+/*     $NetBSD: gemini_obio.c,v 1.10.68.4 2021/04/04 22:01:12 thorpej Exp $    */
 
 /* adapted from:
  *      NetBSD: omap2_obio.c,v 1.5 2008/10/21 18:50:25 matt Exp
@@ -104,7 +104,7 @@
 
 #include "opt_gemini.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.10.68.3 2021/04/03 01:57:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.10.68.4 2021/04/04 22:01:12 thorpej Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -205,7 +205,7 @@
         * attach the rest of our devices
         */
        config_search(self, NULL,
-           CFARG_SUBMATCH, obio_search,
+           CFARG_SEARCH, obio_search,
            CFARG_IATTR, "obio",
            CFARG_EOL);
 
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/imx/imx23_ahb.c
--- a/sys/arch/arm/imx/imx23_ahb.c      Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/imx/imx23_ahb.c      Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_ahb.c,v 1.1.50.3 2021/04/03 01:57:09 thorpej Exp $ */
+/* $Id: imx23_ahb.c,v 1.1.50.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
        aprint_normal("\n");
 
        config_search(self, &aa,
-           CFARG_SUBMATCH, ahb_search_cb,
+           CFARG_SEARCH, ahb_search_cb,
            CFARG_EOL);
 
        ahb_attached = 1;
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/imx/imx23_apbh.c
--- a/sys/arch/arm/imx/imx23_apbh.c     Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/imx/imx23_apbh.c     Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbh.c,v 1.1.56.3 2021/04/03 01:57:09 thorpej Exp $ */
+/* $Id: imx23_apbh.c,v 1.1.56.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -90,10 +90,10 @@
        aprint_normal("\n");
 
        config_search(self, &aa,
-           CFARG_SUBMATCH, apbh_search_crit_cb,
+           CFARG_SEARCH, apbh_search_crit_cb,
            CFARG_EOL);
        config_search(self, &aa,
-           CFARG_SUBMATCH, apbh_search_cb,
+           CFARG_SEARCH, apbh_search_cb,
            CFARG_EOL);
 
        apbh_attached = 1;
diff -r f6a65a9a2a82 -r 042f4f0840d1 sys/arch/arm/imx/imx23_apbx.c
--- a/sys/arch/arm/imx/imx23_apbx.c     Sun Apr 04 19:23:53 2021 +0000
+++ b/sys/arch/arm/imx/imx23_apbx.c     Sun Apr 04 22:01:12 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbx.c,v 1.1.56.3 2021/04/03 01:57:09 thorpej Exp $ */
+/* $Id: imx23_apbx.c,v 1.1.56.4 2021/04/04 22:01:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -90,10 +90,10 @@
        aprint_normal("\n");



Home | Main Index | Thread Index | Old Index