Source-Changes-HG archive

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

[src/thorpej-cfargs]: src/sys config_match() -> config_probe() for the straig...



details:   https://anonhg.NetBSD.org/src/rev/840620ff833f
branches:  thorpej-cfargs
changeset: 981725:840620ff833f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Apr 05 00:48:45 2021 +0000

description:
config_match() -> config_probe() for the straight-forward indirect config
cases.  There are still a few odd balls using config_match() which should
be sorted out later.

diffstat:

 sys/arch/acorn32/eb7500atx/rsbus.c           |  6 +++---
 sys/arch/acorn32/mainbus/pioc.c              |  8 ++++----
 sys/arch/amiga/clockport/clockport.c         |  4 ++--
 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                |  6 +++---
 sys/arch/arm/omap/omapl1x_tipb.c             |  4 ++--
 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/sa1111.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/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/uda1341.c                |  6 +++---
 sys/arch/hpcmips/dev/plum.c                  |  6 +++---
 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                |  6 +++---
 sys/arch/hpcmips/tx/txsim.c                  |  6 +++---
 sys/arch/hpcmips/vr/vrc4173bcu.c             |  6 +++---
 sys/arch/hpcmips/vr/vrip.c                   |  6 +++---
 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                    |  6 +++---
 sys/arch/sun3/sun3/autoconf.c                |  8 ++++----
 sys/arch/sun68k/sun68k/autoconf.c            |  8 ++++----
 sys/arch/vax/vsa/vsbus.c                     |  6 +++---
 sys/arch/x68k/dev/intio.c                    |  6 +++---
 sys/arch/x68k/dev/mfp.c                      |  6 +++---
 sys/arch/x86/pci/amdnb_misc.c                |  6 +++---
 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/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/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                            |  6 +++---
 sys/rump/librump/rumpkern/rump_autoconf.c    |  6 +++---
 138 files changed, 414 insertions(+), 414 deletions(-)

diffs (truncated from 3704 to 300 lines):

diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/acorn32/eb7500atx/rsbus.c
--- a/sys/arch/acorn32/eb7500atx/rsbus.c        Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c        Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.10.52.4 2021/04/04 22:01:12 thorpej Exp $ */
+/* $NetBSD: rsbus.c,v 1.10.52.5 2021/04/05 00:48:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.4 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.5 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,7 +86,7 @@
        sa.sa_size = cf->cf_loc[RSBUSCF_SIZE];
        sa.sa_intr = cf->cf_loc[RSBUSCF_IRQ];
 
-       if (config_match(parent, cf, &sa) > 0)
+       if (config_probe(parent, cf, &sa) > 0)
                config_attach(parent, cf, &sa, rsbus_print, CFARG_EOL);
 
        return (0);
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c   Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c   Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pioc.c,v 1.18.52.6 2021/04/04 22:01:12 thorpej Exp $   */     
+/*     $NetBSD: pioc.c,v 1.18.52.7 2021/04/05 00:48:45 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.6 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18.52.7 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -233,7 +233,7 @@
                }
 
                tryagain = 0;
-               if (config_match(parent, cf, &pa) > 0) {
+               if (config_probe(parent, cf, &pa) > 0) {
                        config_attach(parent, cf, &pa, piocprint, CFARG_EOL);
 /*                     tryagain = (cf->cf_fstate == FSTATE_STAR);*/
                }
@@ -266,7 +266,7 @@
                if (pa->pa_irq == -1)
                        pa->pa_irq = cf->cf_loc[PIOCCF_IRQ];
                tryagain = 0;
-               if (config_match(parent, cf, pa) > 0) {
+               if (config_probe(parent, cf, pa) > 0) {
                        config_attach(parent, cf, pa, piocprint, CFARG_EOL);
 /*                     tryagain = (cf->cf_fstate == FSTATE_STAR);*/
                }
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/amiga/clockport/clockport.c
--- a/sys/arch/amiga/clockport/clockport.c      Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/amiga/clockport/clockport.c      Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockport.c,v 1.5.52.4 2021/04/04 22:01:12 thorpej Exp $ */
+/*      $NetBSD: clockport.c,v 1.5.52.5 2021/04/05 00:48:45 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
        a.cp_iot = sc->cpb_aa->cp_iot;
        a.cp_intr_establish = sc->cpb_aa->cp_intr_establish;
 
-       if (config_match(parent, cf, &a)) {
+       if (config_probe(parent, cf, &a)) {
                config_attach(parent, cf, &a, clockport_print, CFARG_EOL);
                return 1;
        }
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c       Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/at91/at91bus.c       Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: at91bus.c,v 1.27.4.6 2021/04/04 22:01:12 thorpej Exp $ */
+/*     $NetBSD: at91bus.c,v 1.27.4.7 2021/04/05 00:48:45 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.6 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27.4.7 2021/04/05 00:48:45 thorpej Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -651,7 +651,7 @@
        sa->sa_size = cf->cf_loc[AT91BUSCF_SIZE];
        sa->sa_pid  = cf->cf_loc[AT91BUSCF_PID];
 
-       if (config_match(parent, cf, aux) > 0)
+       if (config_probe(parent, cf, aux) > 0)
                config_attach(parent, cf, aux, at91bus_print, CFARG_EOL);
 
        return (0);
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/at91/at91pio.c
--- a/sys/arch/arm/at91/at91pio.c       Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/at91/at91pio.c       Mon Apr 05 00:48:45 2021 +0000
@@ -1,5 +1,5 @@
-/*     $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 $ */
+/*     $Id: at91pio.c,v 1.6.52.5 2021/04/05 00:48:45 thorpej Exp $     */
+/*     $NetBSD: at91pio.c,v 1.6.52.5 2021/04/05 00:48:45 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.4 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91pio.c,v 1.6.52.5 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -223,7 +223,7 @@
        paa.paa_pid = cf->cf_loc[AT91PIOCF_PID];
        paa.paa_bit = cf->cf_loc[AT91PIOCF_BIT];
 
-       if (config_match(parent, cf, &paa) > 0)
+       if (config_probe(parent, cf, &paa) > 0)
                config_attach(parent, cf, &paa, at91pio_print, CFARG_EOL);
 
        return 0;
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/ep93xx/epgpio.c
--- a/sys/arch/arm/ep93xx/epgpio.c      Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/ep93xx/epgpio.c      Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epgpio.c,v 1.5.52.4 2021/04/04 22:01:12 thorpej Exp $  */
+/*     $NetBSD: epgpio.c,v 1.5.52.5 2021/04/05 00:48:45 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.4 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1.5.52.5 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -349,7 +349,7 @@
        ga.ga_bit1 = cf->cf_loc[EPGPIOCF_BIT1];
        ga.ga_bit2 = cf->cf_loc[EPGPIOCF_BIT2];
 
-       if (config_match(parent, cf, &ga) > 0)
+       if (config_probe(parent, cf, &ga) > 0)
                config_attach(parent, cf, &ga, epgpio_print, CFARG_EOL);
 
        return 0;
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/ep93xx/epsoc.c
--- a/sys/arch/arm/ep93xx/epsoc.c       Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/ep93xx/epsoc.c       Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: epsoc.c,v 1.13.52.6 2021/04/04 22:01:12 thorpej Exp $  */
+/*     $NetBSD: epsoc.c,v 1.13.52.7 2021/04/05 00:48:45 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.6 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.13.52.7 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -205,7 +205,7 @@
        sa->sa_size = cf->cf_loc[EPSOCCF_SIZE];
        sa->sa_intr = cf->cf_loc[EPSOCCF_INTR];
 
-       if (config_match(parent, cf, aux) > 0)
+       if (config_probe(parent, cf, aux) > 0)
                config_attach(parent, cf, aux, epsoc_print, CFARG_EOL);
 
        return (0);
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/gemini/gemini_lpc.c
--- a/sys/arch/arm/gemini/gemini_lpc.c  Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/gemini/gemini_lpc.c  Mon Apr 05 00:48:45 2021 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: gemini_lpc.c,v 1.4.52.4 2021/04/04 22:01:12 thorpej Exp $      */
+/*     $NetBSD: gemini_lpc.c,v 1.4.52.5 2021/04/05 00:48:45 thorpej Exp $      */
 
 #include "opt_gemini.h"
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.4 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.5 2021/04/05 00:48:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,7 +131,7 @@
        lpc.lpc_tag      = sc;
        lpc.lpc_base     = sc->sc_addr;
 
-       if (config_match(parent, cf, &lpc)) {
+       if (config_probe(parent, cf, &lpc)) {
                config_attach(parent, cf, &lpc, gemini_lpc_busprint, CFARG_EOL);
                return 0;                       /* love it */
        }
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/gemini/gemini_obio.c
--- a/sys/arch/arm/gemini/gemini_obio.c Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/gemini/gemini_obio.c Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_obio.c,v 1.10.68.4 2021/04/04 22:01:12 thorpej Exp $    */
+/*     $NetBSD: gemini_obio.c,v 1.10.68.5 2021/04/05 00:48:45 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.4 2021/04/04 22:01:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_obio.c,v 1.10.68.5 2021/04/05 00:48:45 thorpej Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -272,7 +272,7 @@
        oa.obio_intr = cf->cf_loc[OBIOCF_INTR];
        oa.obio_intrbase = cf->cf_loc[OBIOCF_INTRBASE];
 
-       if (config_match(parent, cf, &oa)) {
+       if (config_probe(parent, cf, &oa)) {
                config_attach(parent, cf, &oa, obio_print, CFARG_EOL);
                return 0;                       /* love it */
        }
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/imx/imx23_ahb.c
--- a/sys/arch/arm/imx/imx23_ahb.c      Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/imx/imx23_ahb.c      Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_ahb.c,v 1.1.50.4 2021/04/04 22:01:12 thorpej Exp $ */
+/* $Id: imx23_ahb.c,v 1.1.50.5 2021/04/05 00:48:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -117,7 +117,7 @@
        aa->aa_size = cf->cf_loc[AHBCF_SIZE];
        aa->aa_irq = cf->cf_loc[AHBCF_IRQ];
 
-       if (config_match(parent, cf, aux) > 0)
+       if (config_probe(parent, cf, aux) > 0)
                config_attach(parent, cf, aux, ahb_print, CFARG_EOL);
 
        return 0;
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/imx/imx23_apbh.c
--- a/sys/arch/arm/imx/imx23_apbh.c     Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/imx/imx23_apbh.c     Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbh.c,v 1.1.56.4 2021/04/04 22:01:12 thorpej Exp $ */
+/* $Id: imx23_apbh.c,v 1.1.56.5 2021/04/05 00:48:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -126,7 +126,7 @@
        aa->aa_size = cf->cf_loc[APBHCF_SIZE];
        aa->aa_irq = cf->cf_loc[APBHCF_IRQ];
 
-       if (config_match(parent, cf, aux) > 0)
+       if (config_probe(parent, cf, aux) > 0)
                config_attach(parent, cf, aux, apbh_print, CFARG_EOL);
 
        return 0;
@@ -150,7 +150,7 @@
        aa->aa_size = cf->cf_loc[APBHCF_SIZE];
        aa->aa_irq = cf->cf_loc[APBHCF_IRQ];
 
-       if (config_match(parent, cf, aux) > 0)
+       if (config_probe(parent, cf, aux) > 0)
                config_attach(parent, cf, aux, apbh_print, CFARG_EOL);
 
        return 0;
diff -r 9e7bce7e48ea -r 840620ff833f sys/arch/arm/imx/imx23_apbx.c
--- a/sys/arch/arm/imx/imx23_apbx.c     Mon Apr 05 00:26:47 2021 +0000
+++ b/sys/arch/arm/imx/imx23_apbx.c     Mon Apr 05 00:48:45 2021 +0000
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbx.c,v 1.1.56.4 2021/04/04 22:01:12 thorpej Exp $ */
+/* $Id: imx23_apbx.c,v 1.1.56.5 2021/04/05 00:48:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -126,7 +126,7 @@
        aa->aa_size = cf->cf_loc[APBXCF_SIZE];
        aa->aa_irq = cf->cf_loc[APBXCF_IRQ];



Home | Main Index | Thread Index | Old Index