Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej-cfargs]: src/sys/kern Mechanical conversion of config_found_sm_l...
details: https://anonhg.NetBSD.org/src/rev/c86c7583c868
branches: thorpej-cfargs
changeset: 953852:c86c7583c868
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Mar 22 02:00:54 2021 +0000
description:
Mechanical conversion of config_found_sm_loc() -> config_found().
CFARG_IATTR usage needs to be audited.
diffstat:
sys/arch/acorn32/mainbus/pioc.c | 34 +++++++++++++++++++----------
sys/arch/acorn32/podulebus/podulebus.c | 16 ++++++++-----
sys/arch/algor/dev/mainbus.c | 10 +++++---
sys/arch/alpha/jensenio/jensenio.c | 11 ++++++---
sys/arch/alpha/mcbus/mcbus.c | 26 +++++++++++++++-------
sys/arch/alpha/sableio/sableio.c | 11 ++++++---
sys/arch/alpha/tlsb/gbus.c | 11 ++++++---
sys/arch/alpha/tlsb/tlsb.c | 18 ++++++++++-----
sys/arch/arm/at91/at91bus.c | 11 ++++++---
sys/arch/arm/clps711x/clpssoc.c | 10 +++++---
sys/arch/arm/ep93xx/epsoc.c | 20 ++++++++++++-----
sys/arch/arm/marvell/mvsoc.c | 10 +++++---
sys/arch/arm/nxp/imx6_usb.c | 8 ++++--
sys/arch/dreamcast/dev/maple/maple.c | 11 ++++++---
sys/arch/emips/ebus/ebus.c | 11 ++++++---
sys/arch/epoc32/windermere/windermere.c | 10 +++++---
sys/arch/evbmips/alchemy/obio.c | 10 +++++---
sys/arch/evbmips/malta/dev/mainbus.c | 10 +++++---
sys/arch/evbmips/sbmips/zbbus.c | 10 +++++---
sys/arch/evbppc/mpc85xx/autoconf.c | 8 ++++--
sys/arch/evbppc/pmppc/mainbus.c | 22 ++++++++++++-------
sys/arch/evbppc/walnut/dev/pbus.c | 11 ++++++---
sys/arch/hp300/dev/dio.c | 10 +++++---
sys/arch/hp300/dev/frodo.c | 10 +++++---
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c | 10 +++++---
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c | 10 +++++---
sys/arch/hppa/dev/astro.c | 7 ++++-
sys/arch/hppa/dev/dino.c | 9 +++++--
sys/arch/hppa/dev/gecko.c | 6 +++-
sys/arch/hppa/dev/phantomas.c | 7 ++++-
sys/arch/hppa/dev/uturn.c | 8 ++++--
sys/arch/hppa/gsc/gscbus.c | 9 +++++--
sys/arch/hppa/hppa/mainbus.c | 14 ++++++++---
sys/arch/i386/pci/gscpcib.c | 10 +++++---
sys/arch/i386/pnpbios/pnpbios.c | 12 ++++++----
sys/arch/mips/adm5120/adm5120_extio.c | 10 +++++---
sys/arch/mips/adm5120/adm5120_obio.c | 10 +++++---
sys/arch/mips/alchemy/aubus.c | 11 ++++++---
sys/arch/mips/alchemy/dev/aupsc.c | 10 +++++---
sys/arch/mips/atheros/arbus.c | 11 ++++++---
sys/arch/mips/cavium/mainbus.c | 22 ++++++++++++-------
sys/arch/mips/cavium/octeon_bootbus.c | 15 +++++-------
sys/arch/mips/cavium/octeon_iobus.c | 15 +++++-------
sys/arch/mips/sibyte/dev/sbobio.c | 11 ++++++---
sys/arch/mips/sibyte/dev/sbscd.c | 11 ++++++---
sys/arch/mips/sibyte/dev/sbsmbus.c | 11 ++++++---
sys/arch/pmax/ibus/ibus.c | 11 ++++++---
sys/arch/powerpc/booke/dev/cpunode.c | 9 ++++---
sys/arch/powerpc/booke/dev/pq3duart.c | 9 ++++---
sys/arch/powerpc/ibm4xx/dev/exb.c | 11 ++++++---
sys/arch/powerpc/ibm4xx/dev/opb.c | 10 +++++---
sys/arch/sbmips/sbmips/zbbus.c | 10 +++++---
sys/arch/sgimips/gio/gio.c | 16 ++++++++-----
sys/arch/sgimips/hpc/hpc.c | 16 ++++++++-----
sys/arch/sparc/dev/bootbus.c | 10 +++++---
sys/arch/sparc64/dev/sab.c | 12 +++++++---
sys/arch/sun3/sun3/obio.c | 10 +++++---
sys/arch/sun3/sun3x/obio.c | 10 +++++---
sys/arch/x86/x86/mpacpi.c | 25 +++++++++++++++-------
sys/arch/x86/x86/mpbios.c | 18 ++++++++++-----
sys/dev/ata/ata_raid.c | 11 ++++++---
sys/dev/bluetooth/bthidev.c | 11 ++++++---
sys/dev/cardbus/cardbus.c | 11 ++++++---
sys/dev/cardbus/cardslot.c | 11 +++++----
sys/dev/eisa/eisa.c | 11 ++++++---
sys/dev/fdt/fdtbus.c | 12 +++++++---
sys/dev/hdaudio/hdaudio.c | 11 ++++++---
sys/dev/hil/hil.c | 8 ++++--
sys/dev/i2c/i2c.c | 12 ++++++----
sys/dev/i2c/ihidev.c | 18 ++++++++++-----
sys/dev/i2o/iop.c | 18 ++++++++++-----
sys/dev/ic/aac.c | 11 ++++++---
sys/dev/ic/cac.c | 11 ++++++---
sys/dev/ic/cpc700.c | 10 +++++---
sys/dev/ic/i82365.c | 11 ++++++---
sys/dev/ic/icp.c | 26 +++++++++++++++-------
sys/dev/ic/mfi.c | 10 +++++---
sys/dev/ic/mlx.c | 11 ++++++---
sys/dev/ic/tcic2.c | 11 ++++++---
sys/dev/ieee1394/firewire.c | 11 ++++++---
sys/dev/isa/isa.c | 10 +++++---
sys/dev/isapnp/isapnp.c | 10 +++++---
sys/dev/marvell/gt.c | 10 +++++---
sys/dev/marvell/if_gfe.c | 10 +++++---
sys/dev/marvell/if_mvgbe.c | 10 +++++---
sys/dev/mca/edc_mca.c | 11 ++++++---
sys/dev/mca/mca.c | 11 ++++++---
sys/dev/mii/mii.c | 12 +++++++---
sys/dev/pci/amr.c | 12 +++++++---
sys/dev/pci/cxgb/cxgb_main.c | 9 +++++--
sys/dev/pci/mfii.c | 10 +++++---
sys/dev/pci/mpii.c | 10 +++++---
sys/dev/pci/pci.c | 11 ++++++---
sys/dev/pci/puc.c | 11 ++++++---
sys/dev/pci/twa.c | 11 ++++++---
sys/dev/pci/twe.c | 11 ++++++---
sys/dev/pckbport/pckbport.c | 11 ++++++---
sys/dev/pcmcia/pcmcia.c | 12 ++++++----
sys/dev/pcmcia/pcmcom.c | 13 +++++++----
sys/dev/spi/spi.c | 11 +++++----
sys/dev/tc/ioasic_subr.c | 11 ++++++---
sys/dev/tc/tc.c | 18 ++++++++++-----
sys/dev/tc/tcds.c | 11 ++++++---
sys/dev/tc/zs_ioasic.c | 11 ++++++---
sys/dev/usb/auvitek_audio.c | 12 +++++++---
sys/dev/usb/u3g.c | 10 +++++---
sys/dev/usb/uark.c | 10 +++++---
sys/dev/usb/ubsa.c | 10 +++++---
sys/dev/usb/uchcom.c | 10 +++++---
sys/dev/usb/uftdi.c | 10 +++++---
sys/dev/usb/ugensa.c | 10 +++++---
sys/dev/usb/uhidev.c | 12 ++++++----
sys/dev/usb/uhmodem.c | 10 +++++---
sys/dev/usb/uipaq.c | 10 +++++---
sys/dev/usb/umcs.c | 10 +++++---
sys/dev/usb/umct.c | 10 +++++---
sys/dev/usb/umodem_common.c | 10 +++++---
sys/dev/usb/uplcom.c | 10 +++++---
sys/dev/usb/usb_subr.c | 18 ++++++++++-----
sys/dev/usb/uslsa.c | 10 +++++---
sys/dev/usb/uvisor.c | 21 ++++++++++-------
sys/dev/usb/uvscom.c | 10 +++++---
sys/kern/subr_autoconf.c | 8 +-----
123 files changed, 907 insertions(+), 552 deletions(-)
diffs (truncated from 4157 to 300 lines):
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/acorn32/mainbus/pioc.c
--- a/sys/arch/acorn32/mainbus/pioc.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/acorn32/mainbus/pioc.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pioc.c,v 1.18.52.2 2021/03/21 17:35:39 thorpej Exp $ */
+/* $NetBSD: pioc.c,v 1.18.52.3 2021/03/22 02:00:54 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.2 2021/03/21 17:35:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18.52.3 2021/03/22 02:00:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -382,8 +382,10 @@
pa.pa_offset = (PIOC_WDC_PRIMARY_OFFSET << 2);
pa.pa_drq = -1;
pa.pa_irq = -1;
- config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
- piocsubmatch);
+ config_found(self, &pa, piocprint,
+ CFARG_SUBMATCH, piocsubmatch,
+ CFARG_IATTR, "pioc",
+ CFARG_EOL);
}
/*
@@ -401,8 +403,10 @@
pa.pa_offset = (PIOC_FDC_PRIMARY_OFFSET << 2);
pa.pa_drq = -1;
pa.pa_irq = -1;
- config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
- piocsubmatch);
+ config_found(self, &pa, piocprint,
+ CFARG_SUBMATCH, piocsubmatch,
+ CFARG_IATTR, "pioc",
+ CFARG_EOL);
}
/*
@@ -437,8 +441,10 @@
}
pa.pa_drq = -1;
pa.pa_irq = -1;
- config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
- piocsubmatch);
+ config_found(self, &pa, piocprint,
+ CFARG_SUBMATCH, piocsubmatch,
+ CFARG_IATTR, "pioc",
+ CFARG_EOL);
}
if (sc->sc_config[PIOC_CM_CR2] & PIOC_UART2_ENABLE) {
@@ -462,8 +468,10 @@
}
pa.pa_drq = -1;
pa.pa_irq = -1;
- config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
- piocsubmatch);
+ config_found(self, &pa, piocprint,
+ CFARG_SUBMATCH, piocsubmatch,
+ CFARG_IATTR, "pioc",
+ CFARG_EOL);
}
/*
@@ -488,8 +496,10 @@
}
pa.pa_drq = -1;
pa.pa_irq = -1;
- config_found_sm_loc(self, "pioc", NULL, &pa, piocprint,
- piocsubmatch);
+ config_found(self, &pa, piocprint,
+ CFARG_SUBMATCH, piocsubmatch,
+ CFARG_IATTR, "pioc",
+ CFARG_EOL);
}
#if 0
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/acorn32/podulebus/podulebus.c
--- a/sys/arch/acorn32/podulebus/podulebus.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/acorn32/podulebus/podulebus.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.30 2020/11/20 17:38:05 thorpej Exp $ */
+/* $NetBSD: podulebus.c,v 1.30.2.1 2021/03/22 02:00:54 thorpej Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.30 2020/11/20 17:38:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.30.2.1 2021/03/22 02:00:54 thorpej Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -492,8 +492,10 @@
pa.pa_ih = pa.pa_podule_number;
pa.pa_podule = &podules[loop];
pa.pa_iot = &podulebus_bs_tag;
- config_found_sm_loc(self, "podulebus", NULL, &pa,
- podulebusprint, podulebussubmatch);
+ config_found(self, &pa, podulebusprint,
+ CFARG_SUBMATCH, podulebussubmatch,
+ CFARG_IATTR, "podulebus",
+ CFARG_EOL);
continue;
}
if (value == 0xffff) {
@@ -507,8 +509,10 @@
pa.pa_ih = pa.pa_podule_number;
pa.pa_podule = &podules[loop];
pa.pa_iot = &podulebus_bs_tag;
- config_found_sm_loc(self, "podulebus", NULL, &pa,
- podulebusprint, podulebussubmatch);
+ config_found(self, &pa, podulebusprint,
+ CFARG_SUBMATCH, podulebussubmatch,
+ CFARG_IATTR, "podulebus",
+ CFARG_EOL);
}
}
}
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/algor/dev/mainbus.c
--- a/sys/arch/algor/dev/mainbus.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/algor/dev/mainbus.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.28 2020/07/07 03:38:45 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.28.4.1 2021/03/22 02:00:54 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28 2020/07/07 03:38:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.28.4.1 2021/03/22 02:00:54 thorpej Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -220,8 +220,10 @@
ma.ma_st = st;
ma.ma_addr = md->md_addr;
ma.ma_irq = md->md_irq;
- (void) config_found_sm_loc(self, "mainbus", NULL, &ma,
- mainbus_print, mainbus_submatch);
+ config_found(self, &ma, mainbus_print,
+ CFARG_SUBMATCH, mainbus_submatch,
+ CFARG_IATTR, "mainbus",
+ CFARG_EOL);
}
}
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/alpha/jensenio/jensenio.c
--- a/sys/arch/alpha/jensenio/jensenio.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/alpha/jensenio/jensenio.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $ */
+/* $NetBSD: jensenio.c,v 1.19.78.1 2021/03/22 02:00:54 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.19 2009/08/19 15:00:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.19.78.1 2021/03/22 02:00:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -185,8 +185,11 @@
ja.ja_ec = &jcp->jc_ec;
locs[JENSENIOCF_PORT] = jensenio_devs[i].jd_ioaddr;
- (void) config_found_sm_loc(self, "jensenio", locs, &ja,
- jensenio_print, config_stdsubmatch);
+ config_found(self, &ja, jensenio_print,
+ CFARG_SUBMATCH, config_stdsubmatch,
+ CFARG_IATTR, "jensenio",
+ CFARG_LOCATORS, locs,
+ CFARG_EOL);
}
/*
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/alpha/mcbus/mcbus.c
--- a/sys/arch/alpha/mcbus/mcbus.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/alpha/mcbus/mcbus.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcbus.c,v 1.22 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: mcbus.c,v 1.22.62.1 2021/03/22 02:00:54 thorpej Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.22 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcbus.c,v 1.22.62.1 2021/03/22 02:00:54 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,8 +146,11 @@
ta.ma_type = MCBUS_TYPE_MEM;
mbp->mcbus_types[1] = MCBUS_TYPE_MEM;
locs[MCBUSCF_MID] = 1;
- (void) config_found_sm_loc(self, "mcbus", locs, &ta,
- mcbusprint, config_stdsubmatch);
+ config_found(self, &ta, mcbusprint,
+ CFARG_SUBMATCH, config_stdsubmatch,
+ CFARG_IATTR, "mcbus",
+ CFARG_LOCATORS, locs,
+ CFARG_EOL);
/*
* Now find PCI busses.
@@ -164,9 +167,11 @@
ta.ma_type = MCBUS_TYPE_PCI;
locs[MCBUSCF_MID] = mid;
if (MCPCIA_EXISTS(ta.ma_mid, ta.ma_gid))
- (void) config_found_sm_loc(self, "mcbus", locs, &ta,
- mcbusprint,
- config_stdsubmatch);
+ config_found(self, &ta, mcbusprint,
+ CFARG_SUBMATCH, config_stdsubmatch,
+ CFARG_IATTR, "mcbus",
+ CFARG_LOCATORS, locs,
+ CFARG_EOL);
}
#if 0
@@ -193,8 +198,11 @@
ta.ma_type = MCBUS_TYPE_CPU;
mbp->mcbus_types[mid] = MCBUS_TYPE_CPU;
locs[MCBUSCF_MID] = mid;
- (void) config_found_sm_loc(self, "mcbus", locs, &ta,
- mcbusprint, config_stdsubmatch);
+ config_found(self, &ta, mcbusprint,
+ CFARG_SUBMATCH, config_stdsubmatch,
+ CFARG_IATTR, "mcbus",
+ CFARG_LOCATORS, locs,
+ CFARG_EOL);
}
#endif
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/alpha/sableio/sableio.c
--- a/sys/arch/alpha/sableio/sableio.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/alpha/sableio/sableio.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sableio.c,v 1.13 2011/06/14 15:34:22 matt Exp $ */
+/* $NetBSD: sableio.c,v 1.13.68.1 2021/03/22 02:00:54 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.13 2011/06/14 15:34:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sableio.c,v 1.13.68.1 2021/03/22 02:00:54 thorpej Exp $");
#include "isadma.h"
@@ -169,8 +169,11 @@
locs[SABLEIOCF_PORT] = sableio_devs[i].sd_ioaddr;
- (void) config_found_sm_loc(self, "sableio", locs, &sa,
- sableio_print, config_stdsubmatch);
+ config_found(self, &sa, sableio_print,
+ CFARG_SUBMATCH, config_stdsubmatch,
+ CFARG_IATTR, "sableio",
+ CFARG_LOCATORS, locs,
+ CFARG_EOL);
}
}
diff -r 68207b5567e5 -r c86c7583c868 sys/arch/alpha/tlsb/gbus.c
--- a/sys/arch/alpha/tlsb/gbus.c Sun Mar 21 21:08:52 2021 +0000
+++ b/sys/arch/alpha/tlsb/gbus.c Mon Mar 22 02:00:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gbus.c,v 1.22 2011/06/14 15:34:23 matt Exp $ */
+/* $NetBSD: gbus.c,v 1.22.68.1 2021/03/22 02:00:54 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.22 2011/06/14 15:34:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.22.68.1 2021/03/22 02:00:54 thorpej Exp $");
#include <sys/param.h>
Home |
Main Index |
Thread Index |
Old Index