Module Name:    src
Committed By:   thorpej
Date:           Sun Mar 21 17:35:49 UTC 2021

Modified Files:
        src/sys/arch/acorn32/eb7500atx [thorpej-cfargs]: rsbus.c
        src/sys/arch/acorn32/mainbus [thorpej-cfargs]: pioc.c
        src/sys/arch/amiga/clockport [thorpej-cfargs]: clockport.c
        src/sys/arch/arm/at91 [thorpej-cfargs]: at91bus.c
        src/sys/arch/arm/broadcom [thorpej-cfargs]: bcm53xx_ccb.c
        src/sys/arch/arm/ep93xx [thorpej-cfargs]: epsoc.c
        src/sys/arch/arm/gemini [thorpej-cfargs]: gemini_lpc.c
        src/sys/arch/arm/imx [thorpej-cfargs]: imx23_ahb.c imx23_apbh.c
            imx23_apbx.c imx23_usb.c imx31_ahb.c imx31_aips.c imx51_axi.c
            imx51_usb.c
        src/sys/arch/arm/iomd [thorpej-cfargs]: vidc20.c
        src/sys/arch/arm/ixp12x0 [thorpej-cfargs]: ixpsip.c
        src/sys/arch/arm/mainbus [thorpej-cfargs]: mainbus.c
        src/sys/arch/arm/mpcore [thorpej-cfargs]: mpcore_axi.c mpcore_pmr.c
        src/sys/arch/arm/omap [thorpej-cfargs]: omap2_gpmc.c omap2_l3i.c
            omap2_obio.c omap_emifs.c omap_ocp.c omap_tipb.c omapl1x_tipb.c
        src/sys/arch/arm/s3c2xx0 [thorpej-cfargs]: s3c2410.c s3c2410_extint.c
            s3c2410_spi.c s3c2440.c s3c2440_extint.c s3c2440_i2s.c
            s3c2440_spi.c s3c2800.c
        src/sys/arch/arm/sa11x0 [thorpej-cfargs]: sa11x0.c
        src/sys/arch/arm/xscale [thorpej-cfargs]: ixp425_ixme.c ixp425_npe.c
            ixp425_sip.c pxa2x0.c
        src/sys/arch/arm/zynq [thorpej-cfargs]: zynq_axi.c
        src/sys/arch/atari/vme [thorpej-cfargs]: vme.c
        src/sys/arch/cesfic/cesfic [thorpej-cfargs]: autoconf.c
        src/sys/arch/cobalt/cobalt [thorpej-cfargs]: mainbus.c
        src/sys/arch/dreamcast/dev/g1 [thorpej-cfargs]: g1bus.c
        src/sys/arch/dreamcast/dev/g2 [thorpej-cfargs]: g2bus.c
        src/sys/arch/epoc32/epoc32 [thorpej-cfargs]: external.c
        src/sys/arch/evbarm/adi_brh [thorpej-cfargs]: obio.c
        src/sys/arch/evbarm/g42xxeb [thorpej-cfargs]: gb225.c obio.c
        src/sys/arch/evbarm/gumstix [thorpej-cfargs]: gxio.c
        src/sys/arch/evbarm/hdl_g [thorpej-cfargs]: obio.c
        src/sys/arch/evbarm/iq80310 [thorpej-cfargs]: obio.c
        src/sys/arch/evbarm/iq80321 [thorpej-cfargs]: obio.c
        src/sys/arch/evbarm/iyonix [thorpej-cfargs]: obio.c
        src/sys/arch/evbarm/lubbock [thorpej-cfargs]: obio.c sacc_obio.c
        src/sys/arch/evbsh3/evbsh3 [thorpej-cfargs]: mainbus.c
        src/sys/arch/hp300/dev [thorpej-cfargs]: hpib.c
        src/sys/arch/hp300/hp300 [thorpej-cfargs]: autoconf.c
        src/sys/arch/hpcarm/dev [thorpej-cfargs]: ipaq_atmelgpio.c ipaq_saip.c
            j720ssp.c nbppcon.c sacc_hpcarm.c uda1341.c
        src/sys/arch/hpcmips/dev [thorpej-cfargs]: plum.c plumiobus.c ucb1200.c
        src/sys/arch/hpcmips/tx [thorpej-cfargs]: tx39sib.c tx39spi.c
            tx39uart.c txcsbus.c txsim.c
        src/sys/arch/hpcmips/vr [thorpej-cfargs]: vrc4173bcu.c vrip.c
        src/sys/arch/i386/pnpbios [thorpej-cfargs]: pnpbios.c
        src/sys/arch/iyonix/iyonix [thorpej-cfargs]: obio.c
        src/sys/arch/landisk/dev [thorpej-cfargs]: obio.c
        src/sys/arch/mac68k/mac68k [thorpej-cfargs]: mainbus.c
        src/sys/arch/mac68k/obio [thorpej-cfargs]: obio.c
        src/sys/arch/mips/ralink [thorpej-cfargs]: ralink_mainbus.c
        src/sys/arch/mips/rmi [thorpej-cfargs]: rmixl_iobus.c rmixl_mainbus.c
            rmixl_obio.c rmixl_usbi.c
        src/sys/arch/mips/sibyte/dev [thorpej-cfargs]: sbgbus.c
        src/sys/arch/mipsco/obio [thorpej-cfargs]: obio.c
        src/sys/arch/mmeye/mmeye [thorpej-cfargs]: mainbus.c
        src/sys/arch/news68k/dev [thorpej-cfargs]: hb.c
        src/sys/arch/news68k/news68k [thorpej-cfargs]: mainbus.c
        src/sys/arch/newsmips/dev [thorpej-cfargs]: hb.c
        src/sys/arch/next68k/dev [thorpej-cfargs]: intio.c
        src/sys/arch/next68k/next68k [thorpej-cfargs]: mainbus.c
        src/sys/arch/playstation2/dev [thorpej-cfargs]: sbus.c
        src/sys/arch/playstation2/playstation2 [thorpej-cfargs]: mainbus.c
        src/sys/arch/powerpc/booke/dev [thorpej-cfargs]: pq3obio.c
        src/sys/arch/prep/pnpbus [thorpej-cfargs]: pnpbus.c
        src/sys/arch/rs6000/mca [thorpej-cfargs]: ioplanar.c
        src/sys/arch/sandpoint/sandpoint [thorpej-cfargs]: eumb.c
        src/sys/arch/sgimips/gio [thorpej-cfargs]: gio.c
        src/sys/arch/sgimips/ioc [thorpej-cfargs]: ioc.c
        src/sys/arch/sgimips/mace [thorpej-cfargs]: mace.c
        src/sys/arch/sgimips/sgimips [thorpej-cfargs]: mainbus.c
        src/sys/arch/sh3/dev [thorpej-cfargs]: adc.c shb.c
        src/sys/arch/sparc/dev [thorpej-cfargs]: obio.c
        src/sys/arch/sun2/sun2 [thorpej-cfargs]: mbio.c mbmem.c obio.c obmem.c
        src/sys/arch/sun3/sun3 [thorpej-cfargs]: obmem.c vme.c
        src/sys/arch/sun3/sun3x [thorpej-cfargs]: vme.c
        src/sys/arch/vax/vsa [thorpej-cfargs]: vsbus.c
        src/sys/arch/x68k/dev [thorpej-cfargs]: grf_machdep.c intio.c mfp.c
            neptune.c scsirom.c
        src/sys/arch/x86/pci [thorpej-cfargs]: amdnb_misc.c
        src/sys/arch/zaurus/dev [thorpej-cfargs]: zssp.c
        src/sys/dev/gpib [thorpej-cfargs]: cs80bus.c gpib.c
        src/sys/dev/gpio [thorpej-cfargs]: gpio.c
        src/sys/dev/hpc [thorpej-cfargs]: hpcioman.c
        src/sys/dev/isa [thorpej-cfargs]: tsdio.c
        src/sys/dev/marvell [thorpej-cfargs]: obio.c
        src/sys/dev/qbus [thorpej-cfargs]: uba.c
        src/sys/dev/scsipi [thorpej-cfargs]: atapiconf.c scsiconf.c
        src/sys/dev/spi [thorpej-cfargs]: spi.c
        src/sys/dev/vme [thorpej-cfargs]: vme.c

Log Message:
CFARG_IATTR usage audit:

If a device carries only one interface attribute, there is no need
to specify it when calling config_search(); that specification is
meant only to disambiguate which interface attribute (which is a
proxy for "what kind of attach args are being used") is having
children attached.  cfparent_match() will take care of ensuring that
any potential children can attach to one of the parent's iterface
attributes, and if the parent only carries one, no disambiguation is
necessary.


To generate a diff of this commit:
cvs rdiff -u -r1.10.52.1 -r1.10.52.2 src/sys/arch/acorn32/eb7500atx/rsbus.c
cvs rdiff -u -r1.18.52.1 -r1.18.52.2 src/sys/arch/acorn32/mainbus/pioc.c
cvs rdiff -u -r1.5.52.1 -r1.5.52.2 src/sys/arch/amiga/clockport/clockport.c
cvs rdiff -u -r1.27.4.1 -r1.27.4.2 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.6.44.1 -r1.6.44.2 src/sys/arch/arm/broadcom/bcm53xx_ccb.c
cvs rdiff -u -r1.13.52.1 -r1.13.52.2 src/sys/arch/arm/ep93xx/epsoc.c
cvs rdiff -u -r1.4.52.1 -r1.4.52.2 src/sys/arch/arm/gemini/gemini_lpc.c
cvs rdiff -u -r1.1.50.1 -r1.1.50.2 src/sys/arch/arm/imx/imx23_ahb.c
cvs rdiff -u -r1.1.56.1 -r1.1.56.2 src/sys/arch/arm/imx/imx23_apbh.c \
    src/sys/arch/arm/imx/imx23_apbx.c
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/arch/arm/imx/imx23_usb.c
cvs rdiff -u -r1.7.12.1 -r1.7.12.2 src/sys/arch/arm/imx/imx31_ahb.c
cvs rdiff -u -r1.5.52.1 -r1.5.52.2 src/sys/arch/arm/imx/imx31_aips.c
cvs rdiff -u -r1.7.16.1 -r1.7.16.2 src/sys/arch/arm/imx/imx51_axi.c
cvs rdiff -u -r1.5.12.1 -r1.5.12.2 src/sys/arch/arm/imx/imx51_usb.c
cvs rdiff -u -r1.17.54.1 -r1.17.54.2 src/sys/arch/arm/iomd/vidc20.c
cvs rdiff -u -r1.14.52.1 -r1.14.52.2 src/sys/arch/arm/ixp12x0/ixpsip.c
cvs rdiff -u -r1.21.42.1 -r1.21.42.2 src/sys/arch/arm/mainbus/mainbus.c
cvs rdiff -u -r1.1.74.1 -r1.1.74.2 src/sys/arch/arm/mpcore/mpcore_axi.c
cvs rdiff -u -r1.3.68.1 -r1.3.68.2 src/sys/arch/arm/mpcore/mpcore_pmr.c
cvs rdiff -u -r1.10.30.1 -r1.10.30.2 src/sys/arch/arm/omap/omap2_gpmc.c
cvs rdiff -u -r1.6.68.1 -r1.6.68.2 src/sys/arch/arm/omap/omap2_l3i.c
cvs rdiff -u -r1.24.30.1 -r1.24.30.2 src/sys/arch/arm/omap/omap2_obio.c
cvs rdiff -u -r1.5.68.1 -r1.5.68.2 src/sys/arch/arm/omap/omap_emifs.c \
    src/sys/arch/arm/omap/omap_ocp.c
cvs rdiff -u -r1.6.44.1 -r1.6.44.2 src/sys/arch/arm/omap/omap_tipb.c
cvs rdiff -u -r1.1.50.1 -r1.1.50.2 src/sys/arch/arm/omap/omapl1x_tipb.c
cvs rdiff -u -r1.13.52.1 -r1.13.52.2 src/sys/arch/arm/s3c2xx0/s3c2410.c \
    src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
cvs rdiff -u -r1.7.52.1 -r1.7.52.2 src/sys/arch/arm/s3c2xx0/s3c2410_spi.c
cvs rdiff -u -r1.2.52.1 -r1.2.52.2 src/sys/arch/arm/s3c2xx0/s3c2440.c \
    src/sys/arch/arm/s3c2xx0/s3c2440_spi.c
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
cvs rdiff -u -r1.14.52.1 -r1.14.52.2 src/sys/arch/arm/s3c2xx0/s3c2800.c
cvs rdiff -u -r1.27.52.1 -r1.27.52.2 src/sys/arch/arm/sa11x0/sa11x0.c
cvs rdiff -u -r1.5.52.1 -r1.5.52.2 src/sys/arch/arm/xscale/ixp425_ixme.c
cvs rdiff -u -r1.11.34.1 -r1.11.34.2 src/sys/arch/arm/xscale/ixp425_npe.c
cvs rdiff -u -r1.13.52.1 -r1.13.52.2 src/sys/arch/arm/xscale/ixp425_sip.c
cvs rdiff -u -r1.22.52.2 -r1.22.52.3 src/sys/arch/arm/xscale/pxa2x0.c
cvs rdiff -u -r1.1.38.1 -r1.1.38.2 src/sys/arch/arm/zynq/zynq_axi.c
cvs rdiff -u -r1.17.68.1 -r1.17.68.2 src/sys/arch/atari/vme/vme.c
cvs rdiff -u -r1.27.10.1 -r1.27.10.2 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.20.18.1 -r1.20.18.2 src/sys/arch/cobalt/cobalt/mainbus.c
cvs rdiff -u -r1.1.36.1 -r1.1.36.2 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.14.74.1 -r1.14.74.2 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.2.50.1 -r1.2.50.2 src/sys/arch/epoc32/epoc32/external.c
cvs rdiff -u -r1.11.68.1 -r1.11.68.2 src/sys/arch/evbarm/adi_brh/obio.c
cvs rdiff -u -r1.10.68.1 -r1.10.68.2 src/sys/arch/evbarm/g42xxeb/gb225.c
cvs rdiff -u -r1.11.52.1 -r1.11.52.2 src/sys/arch/evbarm/g42xxeb/obio.c
cvs rdiff -u -r1.26.16.1 -r1.26.16.2 src/sys/arch/evbarm/gumstix/gxio.c
cvs rdiff -u -r1.3.68.1 -r1.3.68.2 src/sys/arch/evbarm/hdl_g/obio.c
cvs rdiff -u -r1.20.68.1 -r1.20.68.2 src/sys/arch/evbarm/iq80310/obio.c
cvs rdiff -u -r1.16.68.1 -r1.16.68.2 src/sys/arch/evbarm/iq80321/obio.c
cvs rdiff -u -r1.1.16.1 -r1.1.16.2 src/sys/arch/evbarm/iyonix/obio.c
cvs rdiff -u -r1.10.68.1 -r1.10.68.2 src/sys/arch/evbarm/lubbock/obio.c
cvs rdiff -u -r1.13.52.1 -r1.13.52.2 src/sys/arch/evbarm/lubbock/sacc_obio.c
cvs rdiff -u -r1.9.52.1 -r1.9.52.2 src/sys/arch/evbsh3/evbsh3/mainbus.c
cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/hp300/dev/hpib.c
cvs rdiff -u -r1.108.2.1 -r1.108.2.2 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.16.68.1 -r1.16.68.2 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
cvs rdiff -u -r1.23.68.1 -r1.23.68.2 src/sys/arch/hpcarm/dev/ipaq_saip.c
cvs rdiff -u -r1.32.78.1 -r1.32.78.2 src/sys/arch/hpcarm/dev/j720ssp.c
cvs rdiff -u -r1.3.16.1 -r1.3.16.2 src/sys/arch/hpcarm/dev/nbppcon.c
cvs rdiff -u -r1.12.68.1 -r1.12.68.2 src/sys/arch/hpcarm/dev/sacc_hpcarm.c
cvs rdiff -u -r1.15.68.1 -r1.15.68.2 src/sys/arch/hpcarm/dev/uda1341.c
cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/arch/hpcmips/dev/plum.c
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/arch/hpcmips/dev/plumiobus.c
cvs rdiff -u -r1.19.52.2 -r1.19.52.3 src/sys/arch/hpcmips/dev/ucb1200.c
cvs rdiff -u -r1.21.52.2 -r1.21.52.3 src/sys/arch/hpcmips/tx/tx39sib.c
cvs rdiff -u -r1.5.52.2 -r1.5.52.3 src/sys/arch/hpcmips/tx/tx39spi.c
cvs rdiff -u -r1.15.52.2 -r1.15.52.3 src/sys/arch/hpcmips/tx/tx39uart.c
cvs rdiff -u -r1.22.52.2 -r1.22.52.3 src/sys/arch/hpcmips/tx/txcsbus.c
cvs rdiff -u -r1.17.52.2 -r1.17.52.3 src/sys/arch/hpcmips/tx/txsim.c
cvs rdiff -u -r1.24.28.2 -r1.24.28.3 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.37.52.2 -r1.37.52.3 src/sys/arch/hpcmips/vr/vrip.c
cvs rdiff -u -r1.75.4.1 -r1.75.4.2 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.6.68.1 -r1.6.68.2 src/sys/arch/iyonix/iyonix/obio.c
cvs rdiff -u -r1.9.68.1 -r1.9.68.2 src/sys/arch/landisk/dev/obio.c
cvs rdiff -u -r1.21.68.1 -r1.21.68.2 src/sys/arch/mac68k/mac68k/mainbus.c
cvs rdiff -u -r1.25.68.1 -r1.25.68.2 src/sys/arch/mac68k/obio/obio.c
cvs rdiff -u -r1.5.30.1 -r1.5.30.2 src/sys/arch/mips/ralink/ralink_mainbus.c
cvs rdiff -u -r1.5.10.1 -r1.5.10.2 src/sys/arch/mips/rmi/rmixl_iobus.c
cvs rdiff -u -r1.4.68.2 -r1.4.68.3 src/sys/arch/mips/rmi/rmixl_mainbus.c
cvs rdiff -u -r1.5.68.1 -r1.5.68.2 src/sys/arch/mips/rmi/rmixl_obio.c \
    src/sys/arch/mips/rmi/rmixl_usbi.c
cvs rdiff -u -r1.13.68.1 -r1.13.68.2 src/sys/arch/mips/sibyte/dev/sbgbus.c
cvs rdiff -u -r1.17.68.1 -r1.17.68.2 src/sys/arch/mipsco/obio/obio.c
cvs rdiff -u -r1.9.68.1 -r1.9.68.2 src/sys/arch/mmeye/mmeye/mainbus.c
cvs rdiff -u -r1.19.100.1 -r1.19.100.2 src/sys/arch/news68k/dev/hb.c
cvs rdiff -u -r1.16.70.1 -r1.16.70.2 src/sys/arch/news68k/news68k/mainbus.c
cvs rdiff -u -r1.21.2.1 -r1.21.2.2 src/sys/arch/newsmips/dev/hb.c
cvs rdiff -u -r1.14.68.1 -r1.14.68.2 src/sys/arch/next68k/dev/intio.c
cvs rdiff -u -r1.11.68.1 -r1.11.68.2 src/sys/arch/next68k/next68k/mainbus.c
cvs rdiff -u -r1.17.30.1 -r1.17.30.2 src/sys/arch/playstation2/dev/sbus.c
cvs rdiff -u -r1.16.30.1 -r1.16.30.2 \
    src/sys/arch/playstation2/playstation2/mainbus.c
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 src/sys/arch/powerpc/booke/dev/pq3obio.c
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/prep/pnpbus/pnpbus.c
cvs rdiff -u -r1.4.68.1 -r1.4.68.2 src/sys/arch/rs6000/mca/ioplanar.c
cvs rdiff -u -r1.6.62.1 -r1.6.62.2 src/sys/arch/sandpoint/sandpoint/eumb.c
cvs rdiff -u -r1.36.10.1 -r1.36.10.2 src/sys/arch/sgimips/gio/gio.c
cvs rdiff -u -r1.11.32.1 -r1.11.32.2 src/sys/arch/sgimips/ioc/ioc.c
cvs rdiff -u -r1.23.32.1 -r1.23.32.2 src/sys/arch/sgimips/mace/mace.c
cvs rdiff -u -r1.20.70.1 -r1.20.70.2 src/sys/arch/sgimips/sgimips/mainbus.c
cvs rdiff -u -r1.13.74.1 -r1.13.74.2 src/sys/arch/sh3/dev/adc.c
cvs rdiff -u -r1.14.78.1 -r1.14.78.2 src/sys/arch/sh3/dev/shb.c
cvs rdiff -u -r1.74.50.1 -r1.74.50.2 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.19.32.1 -r1.19.32.2 src/sys/arch/sun2/sun2/mbio.c \
    src/sys/arch/sun2/sun2/obio.c src/sys/arch/sun2/sun2/obmem.c
cvs rdiff -u -r1.20.32.1 -r1.20.32.2 src/sys/arch/sun2/sun2/mbmem.c
cvs rdiff -u -r1.27.44.1 -r1.27.44.2 src/sys/arch/sun3/sun3/obmem.c
cvs rdiff -u -r1.22.44.1 -r1.22.44.2 src/sys/arch/sun3/sun3/vme.c
cvs rdiff -u -r1.17.44.1 -r1.17.44.2 src/sys/arch/sun3/sun3x/vme.c
cvs rdiff -u -r1.65.14.1 -r1.65.14.2 src/sys/arch/vax/vsa/vsbus.c
cvs rdiff -u -r1.32.52.1 -r1.32.52.2 src/sys/arch/x68k/dev/grf_machdep.c
cvs rdiff -u -r1.47.4.1 -r1.47.4.2 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.27.10.1 -r1.27.10.2 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.21.10.1 -r1.21.10.2 src/sys/arch/x68k/dev/neptune.c
cvs rdiff -u -r1.20.44.1 -r1.20.44.2 src/sys/arch/x68k/dev/scsirom.c
cvs rdiff -u -r1.3.14.1 -r1.3.14.2 src/sys/arch/x86/pci/amdnb_misc.c
cvs rdiff -u -r1.13.62.2 -r1.13.62.3 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.17.34.1 -r1.17.34.2 src/sys/dev/gpib/cs80bus.c
cvs rdiff -u -r1.24.10.1 -r1.24.10.2 src/sys/dev/gpib/gpib.c
cvs rdiff -u -r1.64.10.2 -r1.64.10.3 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.19.54.1 -r1.19.54.2 src/sys/dev/hpc/hpcioman.c
cvs rdiff -u -r1.11.54.1 -r1.11.54.2 src/sys/dev/isa/tsdio.c
cvs rdiff -u -r1.15.76.1 -r1.15.76.2 src/sys/dev/marvell/obio.c
cvs rdiff -u -r1.81.10.1 -r1.81.10.2 src/sys/dev/qbus/uba.c
cvs rdiff -u -r1.91.22.1 -r1.91.22.2 src/sys/dev/scsipi/atapiconf.c
cvs rdiff -u -r1.290.4.1 -r1.290.4.2 src/sys/dev/scsipi/scsiconf.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/spi/spi.c
cvs rdiff -u -r1.27.4.1 -r1.27.4.2 src/sys/dev/vme/vme.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/arch/acorn32/eb7500atx/rsbus.c
diff -u src/sys/arch/acorn32/eb7500atx/rsbus.c:1.10.52.1 src/sys/arch/acorn32/eb7500atx/rsbus.c:1.10.52.2
--- src/sys/arch/acorn32/eb7500atx/rsbus.c:1.10.52.1	Sat Mar 20 19:33:30 2021
+++ src/sys/arch/acorn32/eb7500atx/rsbus.c	Sun Mar 21 17:35:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.10.52.1 2021/03/20 19:33:30 thorpej Exp $ */
+/* $NetBSD: rsbus.c,v 1.10.52.2 2021/03/21 17:35:39 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.1 2021/03/20 19:33:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10.52.2 2021/03/21 17:35:39 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,6 @@ rsbus_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, rsbus_search,
-	    CFARG_IATTR, "rsbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/acorn32/mainbus/pioc.c
diff -u src/sys/arch/acorn32/mainbus/pioc.c:1.18.52.1 src/sys/arch/acorn32/mainbus/pioc.c:1.18.52.2
--- src/sys/arch/acorn32/mainbus/pioc.c:1.18.52.1	Sat Mar 20 19:33:30 2021
+++ src/sys/arch/acorn32/mainbus/pioc.c	Sun Mar 21 17:35:39 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pioc.c,v 1.18.52.1 2021/03/20 19:33:30 thorpej Exp $	*/     
+/*	$NetBSD: pioc.c,v 1.18.52.2 2021/03/21 17:35:39 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.1 2021/03/20 19:33:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.18.52.2 2021/03/21 17:35:39 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -495,7 +495,6 @@ piocattach(device_t parent, device_t sel
 #if 0
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, piocsearch,
-	    CFARG_IATTR, "pioc",
 	    CFARG_EOL);
 #endif
 }

Index: src/sys/arch/amiga/clockport/clockport.c
diff -u src/sys/arch/amiga/clockport/clockport.c:1.5.52.1 src/sys/arch/amiga/clockport/clockport.c:1.5.52.2
--- src/sys/arch/amiga/clockport/clockport.c:1.5.52.1	Sat Mar 20 19:33:30 2021
+++ src/sys/arch/amiga/clockport/clockport.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*      $NetBSD: clockport.c,v 1.5.52.1 2021/03/20 19:33:30 thorpej Exp $ */
+/*      $NetBSD: clockport.c,v 1.5.52.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -67,7 +67,6 @@ clockport_attach(device_t parent, device
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, clockport_submatch,
-	    CFARG_IATTR, "clockport",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.27.4.1 src/sys/arch/arm/at91/at91bus.c:1.27.4.2
--- src/sys/arch/arm/at91/at91bus.c:1.27.4.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/at91/at91bus.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: at91bus.c,v 1.27.4.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: at91bus.c,v 1.27.4.2 2021/03/21 17:35:40 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.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27.4.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
@@ -622,7 +622,6 @@ at91bus_attach(device_t parent, device_t
 	sa.sa_dmat = sc->sc_dmat;
 	config_search(self, &sa,
 	    CFARG_SUBMATCH, at91bus_search,
-	    CFARG_IATTR, "at91bus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/broadcom/bcm53xx_ccb.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.6.44.1 src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.6.44.2
--- src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.6.44.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/broadcom/bcm53xx_ccb.c	Sun Mar 21 17:35:40 2021
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.6.44.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.6.44.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -203,7 +203,6 @@ bcmccb_mainbus_attach(device_t parent, d
 
 		cfdata_t cf = config_search(self, &ccbaa,
 					    CFARG_SUBMATCH, bcmccb_find,
-					    CFARG_IATTR, "bcmccb",
 					    CFARG_EOL);
 		if (cf != NULL)
 			config_attach(self, cf, &ccbaa, bcmccb_print);

Index: src/sys/arch/arm/ep93xx/epsoc.c
diff -u src/sys/arch/arm/ep93xx/epsoc.c:1.13.52.1 src/sys/arch/arm/ep93xx/epsoc.c:1.13.52.2
--- src/sys/arch/arm/ep93xx/epsoc.c:1.13.52.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/ep93xx/epsoc.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: epsoc.c,v 1.13.52.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: epsoc.c,v 1.13.52.2 2021/03/21 17:35:40 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.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.13.52.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -173,7 +173,6 @@ epsoc_attach(device_t parent, device_t s
 			      epsoc_print, epsoc_submatch));
 	config_search(self, &sa,
 	    CFARG_SUBMATCH, epsoc_search,
-	    CFARG_IATTR, "epsoc",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/gemini/gemini_lpc.c
diff -u src/sys/arch/arm/gemini/gemini_lpc.c:1.4.52.1 src/sys/arch/arm/gemini/gemini_lpc.c:1.4.52.2
--- src/sys/arch/arm/gemini/gemini_lpc.c:1.4.52.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/gemini/gemini_lpc.c	Sun Mar 21 17:35:40 2021
@@ -1,10 +1,10 @@
-/*	$NetBSD: gemini_lpc.c,v 1.4.52.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: gemini_lpc.c,v 1.4.52.2 2021/03/21 17:35:40 thorpej Exp $	*/
 
 #include "opt_gemini.h"
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_lpc.c,v 1.4.52.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,7 +114,6 @@ gemini_lpc_attach(device_t parent, devic
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, gemini_lpc_search,
-	    CFARG_IATTR, "lpc",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/imx/imx23_ahb.c
diff -u src/sys/arch/arm/imx/imx23_ahb.c:1.1.50.1 src/sys/arch/arm/imx/imx23_ahb.c:1.1.50.2
--- src/sys/arch/arm/imx/imx23_ahb.c:1.1.50.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx23_ahb.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/* $Id: imx23_ahb.c,v 1.1.50.1 2021/03/20 19:33:31 thorpej Exp $ */
+/* $Id: imx23_ahb.c,v 1.1.50.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -85,7 +85,6 @@ ahb_attach(device_t parent, device_t sel
 
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, ahb_search_cb,
-	    CFARG_IATTR, "ahb",
 	    CFARG_EOL);
 
 	ahb_attached = 1;

Index: src/sys/arch/arm/imx/imx23_apbh.c
diff -u src/sys/arch/arm/imx/imx23_apbh.c:1.1.56.1 src/sys/arch/arm/imx/imx23_apbh.c:1.1.56.2
--- src/sys/arch/arm/imx/imx23_apbh.c:1.1.56.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx23_apbh.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbh.c,v 1.1.56.1 2021/03/20 19:33:31 thorpej Exp $ */
+/* $Id: imx23_apbh.c,v 1.1.56.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -91,11 +91,9 @@ apbh_attach(device_t parent, device_t se
 
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, apbh_search_crit_cb,
-	    CFARG_IATTR, "apbh",
 	    CFARG_EOL);
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, apbh_search_cb,
-	    CFARG_IATTR, "apbh",
 	    CFARG_EOL);
 
 	apbh_attached = 1;
Index: src/sys/arch/arm/imx/imx23_apbx.c
diff -u src/sys/arch/arm/imx/imx23_apbx.c:1.1.56.1 src/sys/arch/arm/imx/imx23_apbx.c:1.1.56.2
--- src/sys/arch/arm/imx/imx23_apbx.c:1.1.56.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx23_apbx.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbx.c,v 1.1.56.1 2021/03/20 19:33:31 thorpej Exp $ */
+/* $Id: imx23_apbx.c,v 1.1.56.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -91,11 +91,9 @@ apbx_attach(device_t parent, device_t se
 
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, apbx_search_crit_cb,
-	    CFARG_IATTR, "apbx",
 	    CFARG_EOL);
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, apbx_search_cb,
-	    CFARG_IATTR, "apbx",
 	    CFARG_EOL);
 
 	apbx_attached = 1;

Index: src/sys/arch/arm/imx/imx23_usb.c
diff -u src/sys/arch/arm/imx/imx23_usb.c:1.3.2.1 src/sys/arch/arm/imx/imx23_usb.c:1.3.2.2
--- src/sys/arch/arm/imx/imx23_usb.c:1.3.2.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx23_usb.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/* $Id: imx23_usb.c,v 1.3.2.1 2021/03/20 19:33:31 thorpej Exp $ */
+/* $Id: imx23_usb.c,v 1.3.2.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -123,7 +123,6 @@ imx23_usb_attach(device_t parent, device
 	/* attach OTG/EHCI host controllers */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, imxusbc_search,
-	    CFARG_IATTR, "imxusbc",
 	    CFARG_EOL);
 
 	return;

Index: src/sys/arch/arm/imx/imx31_ahb.c
diff -u src/sys/arch/arm/imx/imx31_ahb.c:1.7.12.1 src/sys/arch/arm/imx/imx31_ahb.c:1.7.12.2
--- src/sys/arch/arm/imx/imx31_ahb.c:1.7.12.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx31_ahb.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx31_ahb.c,v 1.7.12.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: imx31_ahb.c,v 1.7.12.2 2021/03/21 17:35:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.7.12.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.7.12.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include "locators.h"
 #include "avic.h"
@@ -177,7 +177,6 @@ ahb_attach(device_t parent, device_t sel
 	ahba.ahba_dmat = sc->sc_dmat;
 	config_search(self, &ahba,
 	    CFARG_SUBMATCH, ahb_search,
-	    CFARG_IATTR, "ahb",
 	    CFARG_EOL);
 }
 
@@ -264,7 +263,6 @@ ahb_attach_critical(struct ahb_softc *sc
 
 		cf = config_search(sc->sc_dev, &ahba,
 		    CFARG_SUBMATCH, ahb_find,
-		    CFARG_IATTR, "ahb",
 		    CFARG_EOL);
 		if (cf == NULL && critical_devs[i].required)
 			panic("ahb_attach_critical: failed to find %s!",

Index: src/sys/arch/arm/imx/imx31_aips.c
diff -u src/sys/arch/arm/imx/imx31_aips.c:1.5.52.1 src/sys/arch/arm/imx/imx31_aips.c:1.5.52.2
--- src/sys/arch/arm/imx/imx31_aips.c:1.5.52.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx31_aips.c	Sun Mar 21 17:35:40 2021
@@ -1,7 +1,7 @@
-/*	$Id: imx31_aips.c,v 1.5.52.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$Id: imx31_aips.c,v 1.5.52.2 2021/03/21 17:35:40 thorpej Exp $	*/
 
 /* derived from:	*/
-/*	$NetBSD: imx31_aips.c,v 1.5.52.1 2021/03/20 19:33:31 thorpej Exp $ */
+/*	$NetBSD: imx31_aips.c,v 1.5.52.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.5.52.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1.5.52.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include "locators.h"
 
@@ -159,7 +159,6 @@ imxaips_attach(device_t parent, device_t
 	 */
 	config_search(self, sc,
 	    CFARG_SUBMATCH, imxaips_search,
-	    CFARG_IATTR, "aips",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/imx/imx51_axi.c
diff -u src/sys/arch/arm/imx/imx51_axi.c:1.7.16.1 src/sys/arch/arm/imx/imx51_axi.c:1.7.16.2
--- src/sys/arch/arm/imx/imx51_axi.c:1.7.16.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx51_axi.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_axi.c,v 1.7.16.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: imx51_axi.c,v 1.7.16.2 2021/03/21 17:35:40 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.7.16.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.7.16.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -88,11 +88,9 @@ axi_attach(device_t parent __unused, dev
 	aa.aa_dmat = sc->sc_dmat;
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_critical_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/imx/imx51_usb.c
diff -u src/sys/arch/arm/imx/imx51_usb.c:1.5.12.1 src/sys/arch/arm/imx/imx51_usb.c:1.5.12.2
--- src/sys/arch/arm/imx/imx51_usb.c:1.5.12.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/imx/imx51_usb.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_usb.c,v 1.5.12.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: imx51_usb.c,v 1.5.12.2 2021/03/21 17:35:40 thorpej Exp $	*/
 /*
  * Copyright (c) 2010  Genetec Corporation.  All rights reserved.
  * Written by Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.5.12.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.5.12.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include "locators.h"
 #include "opt_imx.h"
@@ -73,7 +73,6 @@ imxusbc_attach_common(device_t parent, d
 	/* attach OTG/EHCI host controllers */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, imxusbc_search,
-	    CFARG_IATTR, "imxusbc",
 	    CFARG_EOL);
 
 	return 0;

Index: src/sys/arch/arm/iomd/vidc20.c
diff -u src/sys/arch/arm/iomd/vidc20.c:1.17.54.1 src/sys/arch/arm/iomd/vidc20.c:1.17.54.2
--- src/sys/arch/arm/iomd/vidc20.c:1.17.54.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/iomd/vidc20.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc20.c,v 1.17.54.1 2021/03/20 19:33:31 thorpej Exp $	*/
+/*	$NetBSD: vidc20.c,v 1.17.54.2 2021/03/21 17:35:40 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.17.54.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1.17.54.2 2021/03/21 17:35:40 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -151,7 +151,6 @@ vidcattach(device_t parent, device_t sel
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vidcsearch,
-	    CFARG_IATTR, "vidc",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/ixp12x0/ixpsip.c
diff -u src/sys/arch/arm/ixp12x0/ixpsip.c:1.14.52.1 src/sys/arch/arm/ixp12x0/ixpsip.c:1.14.52.2
--- src/sys/arch/arm/ixp12x0/ixpsip.c:1.14.52.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/ixp12x0/ixpsip.c	Sun Mar 21 17:35:40 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixpsip.c,v 1.14.52.1 2021/03/20 19:33:31 thorpej Exp $ */
+/*	$NetBSD: ixpsip.c,v 1.14.52.2 2021/03/21 17:35:40 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.14.52.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1.14.52.2 2021/03/21 17:35:40 thorpej Exp $");
 
 /*
  * Slow peripheral bus of ixp12x0 Processor
@@ -73,7 +73,6 @@ ixpsip_attach(device_t parent, device_t 
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ixpsip_search,
-	    CFARG_IATTR, "ixpsip",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/mainbus/mainbus.c
diff -u src/sys/arch/arm/mainbus/mainbus.c:1.21.42.1 src/sys/arch/arm/mainbus/mainbus.c:1.21.42.2
--- src/sys/arch/arm/mainbus/mainbus.c:1.21.42.1	Sat Mar 20 19:33:31 2021
+++ src/sys/arch/arm/mainbus/mainbus.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.21.42.1 2021/03/20 19:33:31 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.21.42.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.42.1 2021/03/20 19:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.42.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -174,7 +174,6 @@ mainbusattach(device_t parent, device_t 
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbussearch,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/mpcore/mpcore_axi.c
diff -u src/sys/arch/arm/mpcore/mpcore_axi.c:1.1.74.1 src/sys/arch/arm/mpcore/mpcore_axi.c:1.1.74.2
--- src/sys/arch/arm/mpcore/mpcore_axi.c:1.1.74.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/mpcore/mpcore_axi.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpcore_axi.c,v 1.1.74.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: mpcore_axi.c,v 1.1.74.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_axi.c,v 1.1.74.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_axi.c,v 1.1.74.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "bus_space_a2x.h"
 #include "bus_space_a4x.h"
@@ -101,11 +101,9 @@ axi_attach(device_t parent __unused, dev
 
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_critical_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/mpcore/mpcore_pmr.c
diff -u src/sys/arch/arm/mpcore/mpcore_pmr.c:1.3.68.1 src/sys/arch/arm/mpcore/mpcore_pmr.c:1.3.68.2
--- src/sys/arch/arm/mpcore/mpcore_pmr.c:1.3.68.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/mpcore/mpcore_pmr.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpcore_pmr.c,v 1.3.68.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: mpcore_pmr.c,v 1.3.68.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2010, 2011 Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c,v 1.3.68.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c,v 1.3.68.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -100,7 +100,6 @@ pmr_attach(device_t parent, device_t sel
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, pmr_search,
-	    CFARG_IATTR, "mpcorepmr",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/omap/omap2_gpmc.c
diff -u src/sys/arch/arm/omap/omap2_gpmc.c:1.10.30.1 src/sys/arch/arm/omap/omap2_gpmc.c:1.10.30.2
--- src/sys/arch/arm/omap/omap2_gpmc.c:1.10.30.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap2_gpmc.c	Sun Mar 21 17:35:41 2021
@@ -1,7 +1,7 @@
-/*	$Id: omap2_gpmc.c,v 1.10.30.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$Id: omap2_gpmc.c,v 1.10.30.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_gpmc.c,v 1.10.30.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap2_gpmc.c,v 1.10.30.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 
 /*
@@ -102,7 +102,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.10.30.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.10.30.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -215,7 +215,6 @@ gpmc_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, gpmc_search,
-	    CFARG_IATTR, "gpmc",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/omap/omap2_l3i.c
diff -u src/sys/arch/arm/omap/omap2_l3i.c:1.6.68.1 src/sys/arch/arm/omap/omap2_l3i.c:1.6.68.2
--- src/sys/arch/arm/omap/omap2_l3i.c:1.6.68.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap2_l3i.c	Sun Mar 21 17:35:41 2021
@@ -1,7 +1,7 @@
-/*	$Id: omap2_l3i.c,v 1.6.68.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$Id: omap2_l3i.c,v 1.6.68.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_l3i.c,v 1.6.68.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap2_l3i.c,v 1.6.68.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,v 1.6.68.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,v 1.6.68.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -222,7 +222,6 @@ L3i_attach(device_t parent, device_t sel
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, L3i_search,
-	    CFARG_IATTR, "L3i",
 	    CFARG_EOL);
 #endif
 }

Index: src/sys/arch/arm/omap/omap2_obio.c
diff -u src/sys/arch/arm/omap/omap2_obio.c:1.24.30.1 src/sys/arch/arm/omap/omap2_obio.c:1.24.30.2
--- src/sys/arch/arm/omap/omap2_obio.c:1.24.30.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap2_obio.c	Sun Mar 21 17:35:41 2021
@@ -1,7 +1,7 @@
-/*	$Id: omap2_obio.c,v 1.24.30.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$Id: omap2_obio.c,v 1.24.30.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_obio.c,v 1.24.30.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap2_obio.c,v 1.24.30.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.24.30.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.24.30.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -200,7 +200,6 @@ obio_attach1(device_t self)
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 
@@ -440,7 +439,6 @@ obio_attach_critical(struct obio_softc *
 
 		cf = config_search(sc->sc_dev, &oa,
 		    CFARG_SUBMATCH, obio_find,
-		    CFARG_IATTR, "obio",
 		    CFARG_EOL);
 		if (cf == NULL) {
 			if (critical_devs[i].required)

Index: src/sys/arch/arm/omap/omap_emifs.c
diff -u src/sys/arch/arm/omap/omap_emifs.c:1.5.68.1 src/sys/arch/arm/omap/omap_emifs.c:1.5.68.2
--- src/sys/arch/arm/omap/omap_emifs.c:1.5.68.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap_emifs.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_emifs.c,v 1.5.68.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap_emifs.c,v 1.5.68.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 
 /*
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.5.68.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_emifs.c,v 1.5.68.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -220,7 +220,6 @@ emifs_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, emifs_search,
-	    CFARG_IATTR, "emifs",
 	    CFARG_EOL);
 }
 
Index: src/sys/arch/arm/omap/omap_ocp.c
diff -u src/sys/arch/arm/omap/omap_ocp.c:1.5.68.1 src/sys/arch/arm/omap/omap_ocp.c:1.5.68.2
--- src/sys/arch/arm/omap/omap_ocp.c:1.5.68.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap_ocp.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_ocp.c,v 1.5.68.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap_ocp.c,v 1.5.68.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP OCP bus.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.5.68.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v 1.5.68.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -161,7 +161,6 @@ ocp_attach(device_t parent, device_t sel
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ocp_search,
-	    CFARG_IATTR, "ocp",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/omap/omap_tipb.c
diff -u src/sys/arch/arm/omap/omap_tipb.c:1.6.44.1 src/sys/arch/arm/omap/omap_tipb.c:1.6.44.2
--- src/sys/arch/arm/omap/omap_tipb.c:1.6.44.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omap_tipb.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap_tipb.c,v 1.6.44.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: omap_tipb.c,v 1.6.44.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Autoconfiguration support for the Texas Instruments OMAP TIPB.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.6.44.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,v 1.6.44.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -187,7 +187,6 @@ tipb_attach(device_t parent, device_t se
 		 */
 		config_search(self, __UNCONST(*earlyp),
 		    CFARG_SUBMATCH, tipb_search,
-		    CFARG_IATTR, "tipb",
 		    CFARG_EOL);
 	}
 
@@ -196,7 +195,6 @@ tipb_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tipb_search,
-	    CFARG_IATTR, "tipb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/omap/omapl1x_tipb.c
diff -u src/sys/arch/arm/omap/omapl1x_tipb.c:1.1.50.1 src/sys/arch/arm/omap/omapl1x_tipb.c:1.1.50.2
--- src/sys/arch/arm/omap/omapl1x_tipb.c:1.1.50.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/omap/omapl1x_tipb.c	Sun Mar 21 17:35:41 2021
@@ -97,7 +97,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_tipb.c,v 1.1.50.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_tipb.c,v 1.1.50.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "locators.h"
 
@@ -193,7 +193,6 @@ tipb_attach(struct device *parent, struc
 		 */
 		config_search(self, __UNCONST(*earlyp),
 		    CFARG_SUBMATCH, tipb_search,
-		    CFARG_IATTR, "tipb",
 		    CFARG_EOL);
 	}
 
@@ -202,7 +201,6 @@ tipb_attach(struct device *parent, struc
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tipb_search,
-	    CFARG_IATTR, "tipb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2410.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410.c:1.13.52.1 src/sys/arch/arm/s3c2xx0/s3c2410.c:1.13.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2410.c:1.13.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2410.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2410.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: s3c2410.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2003, 2005  Genetec corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -166,7 +166,6 @@ s3c2410_attach(device_t parent, device_t
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, s3c2410_search,
-	    CFARG_IATTR, "ssio",
 	    CFARG_EOL);
 	return;
 
Index: src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.13.52.1 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.13.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2410_extint.c:1.13.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2410_extint.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_extint.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $ */
+/* $NetBSD: s3c2410_extint.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2003  Genetec corporation.  All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_extint.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -163,7 +163,6 @@ ssextio_attach(device_t parent, device_t
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ssextio_search,
-	    CFARG_IATTR, "ssextio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2410_spi.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.7.52.1 src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.7.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2410_spi.c:1.7.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2410_spi.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2410_spi.c,v 1.7.52.1 2021/03/20 19:33:32 thorpej Exp $ */
+/* $NetBSD: s3c2410_spi.c,v 1.7.52.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2004  Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.7.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.c,v 1.7.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -130,7 +130,6 @@ ssspi_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ssspi_search,
-	    CFARG_IATTR, "ssspi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2440.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440.c:1.2.52.1 src/sys/arch/arm/s3c2xx0/s3c2440.c:1.2.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2440.c:1.2.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2440.c	Sun Mar 21 17:35:41 2021
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2440.c,v 1.2.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2440.c,v 1.2.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -198,7 +198,6 @@ s3c2440_attach(device_t parent, device_t
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, s3c2440_search,
-	    CFARG_IATTR, "ssio",
 	    CFARG_EOL);
 	return;
 
Index: src/sys/arch/arm/s3c2xx0/s3c2440_spi.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_spi.c:1.2.52.1 src/sys/arch/arm/s3c2xx0/s3c2440_spi.c:1.2.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2440_spi.c:1.2.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2440_spi.c	Sun Mar 21 17:35:41 2021
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2440_spi.c,v 1.2.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2440_spi.c,v 1.2.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,7 +172,6 @@ ssspi_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ssspi_search,
-	    CFARG_IATTR, "ssspi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.3.4.1 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.3.4.2
--- src/sys/arch/arm/s3c2xx0/s3c2440_extint.c:1.3.4.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2440_extint.c	Sun Mar 21 17:35:41 2021
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2440_extint.c,v 1.3.4.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2440_extint.c,v 1.3.4.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -195,7 +195,6 @@ ssextio_attach(device_t parent, device_t
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ssextio_search,
-	    CFARG_IATTR, "ssextio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.4.10.1 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.4.10.2
--- src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c:1.4.10.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c	Sun Mar 21 17:35:41 2021
@@ -95,7 +95,6 @@ s3c2440_i2s_attach(device_t parent, devi
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, s3c2440_i2s_search,
-	    CFARG_IATTR, "ssiis",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/s3c2xx0/s3c2800.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800.c:1.14.52.1 src/sys/arch/arm/s3c2xx0/s3c2800.c:1.14.52.2
--- src/sys/arch/arm/s3c2xx0/s3c2800.c:1.14.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/s3c2xx0/s3c2800.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: s3c2800.c,v 1.14.52.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: s3c2800.c,v 1.14.52.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.14.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v 1.14.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -156,7 +156,6 @@ s3c2800_attach(device_t parent, device_t
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, s3c2800_search,
-	    CFARG_IATTR, "ssio",
 	    CFARG_EOL);
 	return;
 

Index: src/sys/arch/arm/sa11x0/sa11x0.c
diff -u src/sys/arch/arm/sa11x0/sa11x0.c:1.27.52.1 src/sys/arch/arm/sa11x0/sa11x0.c:1.27.52.2
--- src/sys/arch/arm/sa11x0/sa11x0.c:1.27.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/sa11x0/sa11x0.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0.c,v 1.27.52.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$NetBSD: sa11x0.c,v 1.27.52.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.27.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1.27.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -195,7 +195,6 @@ sa11x0_attach(device_t parent, device_t 
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, sa11x0_search,
-	    CFARG_IATTR, "saip",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/xscale/ixp425_ixme.c
diff -u src/sys/arch/arm/xscale/ixp425_ixme.c:1.5.52.1 src/sys/arch/arm/xscale/ixp425_ixme.c:1.5.52.2
--- src/sys/arch/arm/xscale/ixp425_ixme.c:1.5.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/xscale/ixp425_ixme.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_ixme.c,v 1.5.52.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$NetBSD: ixp425_ixme.c,v 1.5.52.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.5.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.c,v 1.5.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,7 +109,6 @@ ixme_attach(device_t parent, device_t se
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ixme_search,
-	    CFARG_IATTR, "ixme",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/xscale/ixp425_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_npe.c:1.11.34.1 src/sys/arch/arm/xscale/ixp425_npe.c:1.11.34.2
--- src/sys/arch/arm/xscale/ixp425_npe.c:1.11.34.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/xscale/ixp425_npe.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_npe.c,v 1.11.34.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$NetBSD: ixp425_npe.c,v 1.11.34.2 2021/03/21 17:35:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2006 Sam Leffler, Errno Consulting
@@ -62,7 +62,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.11.34.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.11.34.2 2021/03/21 17:35:41 thorpej Exp $");
 
 /*
  * Intel XScale Network Processing Engine (NPE) support.
@@ -319,7 +319,6 @@ ixpnpe_attach(device_t parent, device_t 
 
     config_search(self, ixa,
 	CFARG_SUBMATCH, ixpnpe_search,
-	CFARG_IATTR, "ixpnpe",
 	CFARG_EOL);
 }
 

Index: src/sys/arch/arm/xscale/ixp425_sip.c
diff -u src/sys/arch/arm/xscale/ixp425_sip.c:1.13.52.1 src/sys/arch/arm/xscale/ixp425_sip.c:1.13.52.2
--- src/sys/arch/arm/xscale/ixp425_sip.c:1.13.52.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/xscale/ixp425_sip.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_sip.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $ */
+/*	$NetBSD: ixp425_sip.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2003
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_sip.c,v 1.13.52.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_sip.c,v 1.13.52.2 2021/03/21 17:35:41 thorpej Exp $");
 
 /*
  * Slow peripheral bus of IXP425 Processor
@@ -84,7 +84,6 @@ ixpsip_attach(device_t parent, device_t 
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ixpsip_search,
-	    CFARG_IATTR, "ixpsip",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/xscale/pxa2x0.c
diff -u src/sys/arch/arm/xscale/pxa2x0.c:1.22.52.2 src/sys/arch/arm/xscale/pxa2x0.c:1.22.52.3
--- src/sys/arch/arm/xscale/pxa2x0.c:1.22.52.2	Sat Mar 20 20:47:53 2021
+++ src/sys/arch/arm/xscale/pxa2x0.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0.c,v 1.22.52.2 2021/03/20 20:47:53 thorpej Exp $ */
+/*	$NetBSD: pxa2x0.c,v 1.22.52.3 2021/03/21 17:35:41 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0.c,v 1.22.52.2 2021/03/20 20:47:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0.c,v 1.22.52.3 2021/03/21 17:35:41 thorpej Exp $");
 
 #include "pxaintc.h"
 #include "pxagpio.h"
@@ -232,7 +232,6 @@ pxaip_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, pxaip_search,
-	    CFARG_IATTR, "pxaip",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/arm/zynq/zynq_axi.c
diff -u src/sys/arch/arm/zynq/zynq_axi.c:1.1.38.1 src/sys/arch/arm/zynq/zynq_axi.c:1.1.38.2
--- src/sys/arch/arm/zynq/zynq_axi.c:1.1.38.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/arm/zynq/zynq_axi.c	Sun Mar 21 17:35:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zynq_axi.c,v 1.1.38.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$NetBSD: zynq_axi.c,v 1.1.38.2 2021/03/21 17:35:41 thorpej Exp $	*/
 /*-
  * Copyright (c) 2010 SHIMIZU Ryo <[email protected]>
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_axi.c,v 1.1.38.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_axi.c,v 1.1.38.2 2021/03/21 17:35:41 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -83,11 +83,9 @@ axi_attach(device_t parent __unused, dev
 
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_critical_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 	config_search(self, &aa,
 	    CFARG_SUBMATCH, axi_search,
-	    CFARG_IATTR, "axi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/atari/vme/vme.c
diff -u src/sys/arch/atari/vme/vme.c:1.17.68.1 src/sys/arch/atari/vme/vme.c:1.17.68.2
--- src/sys/arch/atari/vme/vme.c:1.17.68.1	Sat Mar 20 19:33:32 2021
+++ src/sys/arch/atari/vme/vme.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme.c,v 1.17.68.1 2021/03/20 19:33:32 thorpej Exp $	*/
+/*	$NetBSD: vme.c,v 1.17.68.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17.68.1 2021/03/20 19:33:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17.68.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,6 @@ vmeattach(device_t parent, device_t self
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vmesearch,
-	    CFARG_IATTR, "vme",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/cesfic/cesfic/autoconf.c
diff -u src/sys/arch/cesfic/cesfic/autoconf.c:1.27.10.1 src/sys/arch/cesfic/cesfic/autoconf.c:1.27.10.2
--- src/sys/arch/cesfic/cesfic/autoconf.c:1.27.10.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/cesfic/cesfic/autoconf.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.27.10.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.27.10.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.27.10.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.27.10.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,6 @@ mainbusattach(device_t parent, device_t 
 	/* Search for and attach children. */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbussearch,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/cobalt/cobalt/mainbus.c
diff -u src/sys/arch/cobalt/cobalt/mainbus.c:1.20.18.1 src/sys/arch/cobalt/cobalt/mainbus.c:1.20.18.2
--- src/sys/arch/cobalt/cobalt/mainbus.c:1.20.18.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/cobalt/cobalt/mainbus.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.20.18.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.20.18.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20.18.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20.18.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -65,7 +65,6 @@ mainbus_attach(device_t parent, device_t
 
 	config_search(self, &ma,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/dreamcast/dev/g1/g1bus.c
diff -u src/sys/arch/dreamcast/dev/g1/g1bus.c:1.1.36.1 src/sys/arch/dreamcast/dev/g1/g1bus.c:1.1.36.2
--- src/sys/arch/dreamcast/dev/g1/g1bus.c:1.1.36.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/dreamcast/dev/g1/g1bus.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: g1bus.c,v 1.1.36.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: g1bus.c,v 1.1.36.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.1.36.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g1bus.c,v 1.1.36.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -77,7 +77,6 @@ g1busattach(device_t parent, device_t se
 
 	config_search(self, &ga,
 	    CFARG_SUBMATCH, g1bussearch,
-	    CFARG_IATTR, "g1bus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/dreamcast/dev/g2/g2bus.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus.c:1.14.74.1 src/sys/arch/dreamcast/dev/g2/g2bus.c:1.14.74.2
--- src/sys/arch/dreamcast/dev/g2/g2bus.c:1.14.74.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/dreamcast/dev/g2/g2bus.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: g2bus.c,v 1.14.74.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: g2bus.c,v 1.14.74.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.14.74.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus.c,v 1.14.74.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +79,6 @@ g2busattach(device_t parent, device_t se
 
 	config_search(self, &ga,
 	    CFARG_SUBMATCH, g2bussearch,
-	    CFARG_IATTR, "g2bus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/epoc32/epoc32/external.c
diff -u src/sys/arch/epoc32/epoc32/external.c:1.2.50.1 src/sys/arch/epoc32/epoc32/external.c:1.2.50.2
--- src/sys/arch/epoc32/epoc32/external.c:1.2.50.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/epoc32/epoc32/external.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: external.c,v 1.2.50.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: external.c,v 1.2.50.2 2021/03/21 17:35:42 thorpej Exp $	*/
 /*
  * Copyright (c) 2012, 2013 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.2.50.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: external.c,v 1.2.50.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -66,7 +66,6 @@ external_attach(device_t parent, device_
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, external_search,
-	    CFARG_IATTR, "external",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/adi_brh/obio.c
diff -u src/sys/arch/evbarm/adi_brh/obio.c:1.11.68.1 src/sys/arch/evbarm/adi_brh/obio.c:1.11.68.2
--- src/sys/arch/evbarm/adi_brh/obio.c:1.11.68.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/evbarm/adi_brh/obio.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.11.68.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.11.68.2 2021/03/21 17:35:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11.68.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11.68.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -106,7 +106,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/g42xxeb/gb225.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225.c:1.10.68.1 src/sys/arch/evbarm/g42xxeb/gb225.c:1.10.68.2
--- src/sys/arch/evbarm/g42xxeb/gb225.c:1.10.68.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/evbarm/g42xxeb/gb225.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gb225.c,v 1.10.68.1 2021/03/20 19:33:33 thorpej Exp $ */
+/*	$NetBSD: gb225.c,v 1.10.68.2 2021/03/21 17:35:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec corp.  All rights reserved.
@@ -175,7 +175,6 @@ opio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, opio_search,
-	    CFARG_IATTR, "opio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/g42xxeb/obio.c
diff -u src/sys/arch/evbarm/g42xxeb/obio.c:1.11.52.1 src/sys/arch/evbarm/g42xxeb/obio.c:1.11.52.2
--- src/sys/arch/evbarm/g42xxeb/obio.c:1.11.52.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/evbarm/g42xxeb/obio.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.11.52.1 2021/03/20 19:33:33 thorpej Exp $ */
+/*	$NetBSD: obio.c,v 1.11.52.2 2021/03/21 17:35:42 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec corp.  All rights reserved.
@@ -263,7 +263,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 	return;
 

Index: src/sys/arch/evbarm/gumstix/gxio.c
diff -u src/sys/arch/evbarm/gumstix/gxio.c:1.26.16.1 src/sys/arch/evbarm/gumstix/gxio.c:1.26.16.2
--- src/sys/arch/evbarm/gumstix/gxio.c:1.26.16.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/evbarm/gumstix/gxio.c	Sun Mar 21 17:35:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gxio.c,v 1.26.16.1 2021/03/20 19:33:33 thorpej Exp $ */
+/*	$NetBSD: gxio.c,v 1.26.16.2 2021/03/21 17:35:42 thorpej Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.26.16.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gxio.c,v 1.26.16.2 2021/03/21 17:35:42 thorpej Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_gumstix.h"
@@ -392,7 +392,6 @@ gxioattach(device_t parent, device_t sel
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, gxiosearch,
-	    CFARG_IATTR, "gxio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/hdl_g/obio.c
diff -u src/sys/arch/evbarm/hdl_g/obio.c:1.3.68.1 src/sys/arch/evbarm/hdl_g/obio.c:1.3.68.2
--- src/sys/arch/evbarm/hdl_g/obio.c:1.3.68.1	Sat Mar 20 19:33:33 2021
+++ src/sys/arch/evbarm/hdl_g/obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.3.68.1 2021/03/20 19:33:33 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.3.68.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3.68.1 2021/03/20 19:33:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3.68.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/iq80310/obio.c
diff -u src/sys/arch/evbarm/iq80310/obio.c:1.20.68.1 src/sys/arch/evbarm/iq80310/obio.c:1.20.68.2
--- src/sys/arch/evbarm/iq80310/obio.c:1.20.68.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbarm/iq80310/obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.20.68.1 2021/03/20 19:33:34 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.20.68.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003  Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20.68.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.20.68.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/iq80321/obio.c
diff -u src/sys/arch/evbarm/iq80321/obio.c:1.16.68.1 src/sys/arch/evbarm/iq80321/obio.c:1.16.68.2
--- src/sys/arch/evbarm/iq80321/obio.c:1.16.68.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbarm/iq80321/obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.16.68.1 2021/03/20 19:33:34 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.16.68.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16.68.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16.68.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/iyonix/obio.c
diff -u src/sys/arch/evbarm/iyonix/obio.c:1.1.16.1 src/sys/arch/evbarm/iyonix/obio.c:1.1.16.2
--- src/sys/arch/evbarm/iyonix/obio.c:1.1.16.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbarm/iyonix/obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.1.16.1 2021/03/20 19:33:34 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.1.16.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1.16.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1.16.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,7 +104,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/lubbock/obio.c
diff -u src/sys/arch/evbarm/lubbock/obio.c:1.10.68.1 src/sys/arch/evbarm/lubbock/obio.c:1.10.68.2
--- src/sys/arch/evbarm/lubbock/obio.c:1.10.68.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbarm/lubbock/obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.10.68.1 2021/03/20 19:33:34 thorpej Exp $ */
+/*	$NetBSD: obio.c,v 1.10.68.2 2021/03/21 17:35:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002, 2003  Genetec Corporation.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10.68.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10.68.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -285,7 +285,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/evbarm/lubbock/sacc_obio.c
diff -u src/sys/arch/evbarm/lubbock/sacc_obio.c:1.13.52.1 src/sys/arch/evbarm/lubbock/sacc_obio.c:1.13.52.2
--- src/sys/arch/evbarm/lubbock/sacc_obio.c:1.13.52.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbarm/lubbock/sacc_obio.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sacc_obio.c,v 1.13.52.1 2021/03/20 19:33:34 thorpej Exp $ */
+/*	$NetBSD: sacc_obio.c,v 1.13.52.2 2021/03/21 17:35:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.13.52.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,v 1.13.52.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -176,7 +176,6 @@ sacc_obio_attach(device_t parent, device
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, sa1111_search,
-	    CFARG_IATTR, "sacc",
 	    CFARG_EOL);
 
 	return;

Index: src/sys/arch/evbsh3/evbsh3/mainbus.c
diff -u src/sys/arch/evbsh3/evbsh3/mainbus.c:1.9.52.1 src/sys/arch/evbsh3/evbsh3/mainbus.c:1.9.52.2
--- src/sys/arch/evbsh3/evbsh3/mainbus.c:1.9.52.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/evbsh3/evbsh3/mainbus.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.9.52.1 2021/03/20 19:33:34 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.9.52.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9.52.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9.52.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,7 +67,6 @@ mainbus_attach(device_t parent, device_t
 	/* Devices */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hp300/dev/hpib.c
diff -u src/sys/arch/hp300/dev/hpib.c:1.41.2.1 src/sys/arch/hp300/dev/hpib.c:1.41.2.2
--- src/sys/arch/hp300/dev/hpib.c:1.41.2.1	Sat Mar 20 19:33:34 2021
+++ src/sys/arch/hp300/dev/hpib.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpib.c,v 1.41.2.1 2021/03/20 19:33:34 thorpej Exp $	*/
+/*	$NetBSD: hpib.c,v 1.41.2.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.41.2.1 2021/03/20 19:33:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.41.2.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -195,7 +195,6 @@ hpibbus_attach_children(struct hpibbus_s
 		 */
 		config_search(sc->sc_dev, &ha,
 		    CFARG_SUBMATCH, hpibbussearch,
-		    CFARG_IATTR, "hpibbus",
 		    CFARG_EOL);
 	}
 }

Index: src/sys/arch/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.108.2.1 src/sys/arch/hp300/hp300/autoconf.c:1.108.2.2
--- src/sys/arch/hp300/hp300/autoconf.c:1.108.2.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hp300/hp300/autoconf.c	Sun Mar 21 17:35:43 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.108.2.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.108.2.2 2021/03/21 17:35:43 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.108.2.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.108.2.2 2021/03/21 17:35:43 thorpej Exp $");
 
 #include "dvbox.h"
 #include "gbox.h"
@@ -262,7 +262,6 @@ mainbusattach(device_t parent, device_t 
 	/* Search for and attach children. */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbussearch,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c
diff -u src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.16.68.1 src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.16.68.2
--- src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c:1.16.68.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/ipaq_atmelgpio.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_atmelgpio.c,v 1.16.68.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: ipaq_atmelgpio.c,v 1.16.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.  All rights reserved.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.16.68.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_atmelgpio.c,v 1.16.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,7 +125,6 @@ atmelgpio_attach(device_t parent, device
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, atmelgpio_search,
-	    CFARG_IATTR, "atmelgpioif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/ipaq_saip.c
diff -u src/sys/arch/hpcarm/dev/ipaq_saip.c:1.23.68.1 src/sys/arch/hpcarm/dev/ipaq_saip.c:1.23.68.2
--- src/sys/arch/hpcarm/dev/ipaq_saip.c:1.23.68.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/ipaq_saip.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipaq_saip.c,v 1.23.68.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: ipaq_saip.c,v 1.23.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.23.68.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_saip.c,v 1.23.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,7 +109,6 @@ ipaq_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ipaq_search,
-	    CFARG_IATTR, "ipaqbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/j720ssp.c
diff -u src/sys/arch/hpcarm/dev/j720ssp.c:1.32.78.1 src/sys/arch/hpcarm/dev/j720ssp.c:1.32.78.2
--- src/sys/arch/hpcarm/dev/j720ssp.c:1.32.78.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/j720ssp.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: j720ssp.c,v 1.32.78.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: j720ssp.c,v 1.32.78.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 /* Jornada 720 SSP port. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: j720ssp.c,v 1.32.78.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: j720ssp.c,v 1.32.78.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,7 +99,6 @@ j720ssp_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, j720ssp_search,
-	    CFARG_IATTR, "j720ssp",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/nbppcon.c
diff -u src/sys/arch/hpcarm/dev/nbppcon.c:1.3.16.1 src/sys/arch/hpcarm/dev/nbppcon.c:1.3.16.2
--- src/sys/arch/hpcarm/dev/nbppcon.c:1.3.16.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/nbppcon.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbppcon.c,v 1.3.16.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*	$NetBSD: nbppcon.c,v 1.3.16.2 2021/03/21 17:35:44 thorpej Exp $ */
 /*
  * Copyright (c) 2011 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nbppcon.c,v 1.3.16.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nbppcon.c,v 1.3.16.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -109,7 +109,6 @@ nbppcon_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, nbppcon_search,
-	    CFARG_IATTR, "nbppcon",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/sacc_hpcarm.c
diff -u src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.12.68.1 src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.12.68.2
--- src/sys/arch/hpcarm/dev/sacc_hpcarm.c:1.12.68.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/sacc_hpcarm.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*      $NetBSD: sacc_hpcarm.c,v 1.12.68.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*      $NetBSD: sacc_hpcarm.c,v 1.12.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.12.68.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sacc_hpcarm.c,v 1.12.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,7 +125,6 @@ sacc_attach(device_t parent, device_t se
 	/* attach each devices */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, sa1111_search,
-	    CFARG_IATTR, "sacc",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcarm/dev/uda1341.c
diff -u src/sys/arch/hpcarm/dev/uda1341.c:1.15.68.1 src/sys/arch/hpcarm/dev/uda1341.c:1.15.68.2
--- src/sys/arch/hpcarm/dev/uda1341.c:1.15.68.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcarm/dev/uda1341.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uda1341.c,v 1.15.68.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: uda1341.c,v 1.15.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.  All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.15.68.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda1341.c,v 1.15.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -148,7 +148,6 @@ uda1341_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, uda1341_search,
-	    CFARG_IATTR, "udaif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/dev/plum.c
diff -u src/sys/arch/hpcmips/dev/plum.c:1.18.2.2 src/sys/arch/hpcmips/dev/plum.c:1.18.2.3
--- src/sys/arch/hpcmips/dev/plum.c:1.18.2.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/dev/plum.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: plum.c,v 1.18.2.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: plum.c,v 1.18.2.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18.2.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18.2.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,7 +114,6 @@ plum_attach(device_t parent, device_t se
 	sc->sc_pri = 2;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, plum_search,
-	    CFARG_IATTR, "plumif",
 	    CFARG_EOL);
 
 	/* 
@@ -123,7 +122,6 @@ plum_attach(device_t parent, device_t se
 	sc->sc_pri = 1;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, plum_search,
-	    CFARG_IATTR, "plumif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/dev/plumiobus.c
diff -u src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.2 src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.3
--- src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/dev/plumiobus.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: plumiobus.c,v 1.16.2.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: plumiobus.c,v 1.16.2.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.16.2.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.16.2.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #define PLUMIOBUSDEBUG
 
@@ -165,7 +165,6 @@ plumiobus_attach(device_t parent, device
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, plumiobus_search,
-	    CFARG_IATTR, "plumiobusif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/dev/ucb1200.c
diff -u src/sys/arch/hpcmips/dev/ucb1200.c:1.19.52.2 src/sys/arch/hpcmips/dev/ucb1200.c:1.19.52.3
--- src/sys/arch/hpcmips/dev/ucb1200.c:1.19.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/dev/ucb1200.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucb1200.c,v 1.19.52.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: ucb1200.c,v 1.19.52.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucb1200.c,v 1.19.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucb1200.c,v 1.19.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,7 +135,6 @@ ucb1200_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ucb1200_search,
-	    CFARG_IATTR, "ucbif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/tx/tx39sib.c
diff -u src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.2 src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.3
--- src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/tx/tx39sib.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39sib.c,v 1.21.52.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: tx39sib.c,v 1.21.52.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39sib.c,v 1.21.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39sib.c,v 1.21.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #undef TX39SIBDEBUG
 
@@ -179,7 +179,6 @@ tx39sib_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tx39sib_search,
-	    CFARG_IATTR, "txsibif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/tx/tx39spi.c
diff -u src/sys/arch/hpcmips/tx/tx39spi.c:1.5.52.2 src/sys/arch/hpcmips/tx/tx39spi.c:1.5.52.3
--- src/sys/arch/hpcmips/tx/tx39spi.c:1.5.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/tx/tx39spi.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39spi.c,v 1.5.52.2 2021/03/20 20:49:43 thorpej Exp $	*/
+/*	$NetBSD: tx39spi.c,v 1.5.52.3 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: tx39spi.c,v 1.5.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39spi.c,v 1.5.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +89,6 @@ tx39spi_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tx39spi_search,
-	    CFARG_IATTR, "txspiif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/tx/tx39uart.c
diff -u src/sys/arch/hpcmips/tx/tx39uart.c:1.15.52.2 src/sys/arch/hpcmips/tx/tx39uart.c:1.15.52.3
--- src/sys/arch/hpcmips/tx/tx39uart.c:1.15.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/tx/tx39uart.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx39uart.c,v 1.15.52.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: tx39uart.c,v 1.15.52.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39uart.c,v 1.15.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39uart.c,v 1.15.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include "opt_tx39uart_debug.h"
 
@@ -77,7 +77,6 @@ tx39uart_attach(device_t parent, device_
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tx39uart_search,
-	    CFARG_IATTR, "txcomif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/tx/txcsbus.c
diff -u src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.2 src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.3
--- src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/tx/txcsbus.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: txcsbus.c,v 1.22.52.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: txcsbus.c,v 1.22.52.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.22.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.22.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,14 +145,12 @@ txcsbus_attach(device_t parent, device_t
 	sc->sc_pri = 2;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, txcsbus_search,
-	    CFARG_IATTR, "txcsbus",
 	    CFARG_EOL);
 
 	/* then, normal priority devices */
 	sc->sc_pri = 1;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, txcsbus_search,
-	    CFARG_IATTR, "txcsbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/tx/txsim.c
diff -u src/sys/arch/hpcmips/tx/txsim.c:1.17.52.2 src/sys/arch/hpcmips/tx/txsim.c:1.17.52.3
--- src/sys/arch/hpcmips/tx/txsim.c:1.17.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/tx/txsim.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: txsim.c,v 1.17.52.2 2021/03/20 20:49:43 thorpej Exp $ */
+/*	$NetBSD: txsim.c,v 1.17.52.3 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.17.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.17.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -92,7 +92,6 @@ txsim_attach(device_t parent, device_t s
 	sc->sc_pri = ATTACH_FIRST;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, txsim_search,
-	    CFARG_IATTR, "txsim",
 	    CFARG_EOL);
 
 	/*
@@ -102,7 +101,6 @@ txsim_attach(device_t parent, device_t s
 	sc->sc_pri = ATTACH_NORMAL;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, txsim_search,
-	    CFARG_IATTR, "txsim",
 	    CFARG_EOL);
 
 	/* 
@@ -111,7 +109,6 @@ txsim_attach(device_t parent, device_t s
 	sc->sc_pri = ATTACH_LAST;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, txsim_search,
-	    CFARG_IATTR, "txsim",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/hpcmips/vr/vrc4173bcu.c
diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.2 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.3
--- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/vr/vrc4173bcu.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vrc4173bcu.c,v 1.24.28.2 2021/03/20 20:49:43 thorpej Exp $	*/
+/*	$NetBSD: vrc4173bcu.c,v 1.24.28.3 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001,2002 Enami Tsugutomo.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24.28.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24.28.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -427,7 +427,6 @@ vrc4173bcu_attach(device_t parent, devic
 	for (sc->sc_pri = 2; 0 < sc->sc_pri; sc->sc_pri--) {
 		config_search(self, NULL,
 		    CFARG_SUBMATCH, vrc4173bcu_search,
-		    CFARG_IATTR, "vripif",
 		    CFARG_EOL);
 	}
 }

Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.37.52.2 src/sys/arch/hpcmips/vr/vrip.c:1.37.52.3
--- src/sys/arch/hpcmips/vr/vrip.c:1.37.52.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/hpcmips/vr/vrip.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vrip.c,v 1.37.52.2 2021/03/20 20:49:43 thorpej Exp $	*/
+/*	$NetBSD: vrip.c,v 1.37.52.3 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.3 2021/03/21 17:35:44 thorpej Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -247,14 +247,12 @@ vripattach_common(device_t parent, devic
 	sc->sc_pri = 2;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vrip_search,
-	    CFARG_IATTR, "vripif",
 	    CFARG_EOL);
 
 	/* Other system devices. */
 	sc->sc_pri = 1;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vrip_search,
-	    CFARG_IATTR, "vripif",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.75.4.1 src/sys/arch/i386/pnpbios/pnpbios.c:1.75.4.2
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.75.4.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/i386/pnpbios/pnpbios.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.75.4.1 2021/03/20 19:33:35 thorpej Exp $ */
+/* $NetBSD: pnpbios.c,v 1.75.4.2 2021/03/21 17:35:44 thorpej Exp $ */
 
 /*
  * Copyright (c) 2000 Jason R. Thorpe.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.75.4.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.75.4.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -774,7 +774,6 @@ pnpbios_attachchild(struct pnpbios_softc
 	if (matchonly)
 		return (config_search(sc->sc_dev, aa,
 				      CFARG_SUBMATCH, config_stdsubmatch,
-				      CFARG_IATTR, "pnpbios",
 				      CFARG_LOCATORS, locs,
 				      CFARG_EOL) != NULL);
 	else 

Index: src/sys/arch/iyonix/iyonix/obio.c
diff -u src/sys/arch/iyonix/iyonix/obio.c:1.6.68.1 src/sys/arch/iyonix/iyonix/obio.c:1.6.68.2
--- src/sys/arch/iyonix/iyonix/obio.c:1.6.68.1	Sat Mar 20 19:33:35 2021
+++ src/sys/arch/iyonix/iyonix/obio.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.6.68.1 2021/03/20 19:33:35 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.6.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.6.68.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.6.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,7 +104,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/landisk/dev/obio.c
diff -u src/sys/arch/landisk/dev/obio.c:1.9.68.1 src/sys/arch/landisk/dev/obio.c:1.9.68.2
--- src/sys/arch/landisk/dev/obio.c:1.9.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/landisk/dev/obio.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.9.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.9.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include "btn_obio.h"
 #include "pwrsw_obio.h"
@@ -107,7 +107,6 @@ obio_attach(device_t parent, device_t se
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mac68k/mac68k/mainbus.c
diff -u src/sys/arch/mac68k/mac68k/mainbus.c:1.21.68.1 src/sys/arch/mac68k/mac68k/mainbus.c:1.21.68.2
--- src/sys/arch/mac68k/mac68k/mainbus.c:1.21.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mac68k/mac68k/mainbus.c	Sun Mar 21 17:35:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.21.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.21.68.2 2021/03/21 17:35:44 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21.68.2 2021/03/21 17:35:44 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -94,7 +94,6 @@ mainbus_attach(device_t parent, device_t
 	/* Search for and attach children. */
 	config_search(self, &mba,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mac68k/obio/obio.c
diff -u src/sys/arch/mac68k/obio/obio.c:1.25.68.1 src/sys/arch/mac68k/obio/obio.c:1.25.68.2
--- src/sys/arch/mac68k/obio/obio.c:1.25.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mac68k/obio/obio.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.25.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.25.68.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.25.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.25.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,6 @@ obio_attach(device_t parent, device_t se
 	/* Search for and attach children. */
 	config_search(self, aux,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mips/ralink/ralink_mainbus.c
diff -u src/sys/arch/mips/ralink/ralink_mainbus.c:1.5.30.1 src/sys/arch/mips/ralink/ralink_mainbus.c:1.5.30.2
--- src/sys/arch/mips/ralink/ralink_mainbus.c:1.5.30.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/ralink/ralink_mainbus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ralink_mainbus.c,v 1.5.30.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: ralink_mainbus.c,v 1.5.30.2 2021/03/21 17:35:45 thorpej Exp $	*/
 /*-
  * Copyright (c) 2011 CradlePoint Technology, Inc.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.5.30.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_mainbus.c,v 1.5.30.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include "locators.h"
 #include <sys/param.h>
@@ -121,7 +121,6 @@ mainbus_attach(device_t parent, device_t
 	/* attach other devices */
 	config_search(self, &ma,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 
@@ -182,7 +181,6 @@ mainbus_attach_critical(struct mainbus_s
 
 		cf = config_search(sc->sc_dev, &ma,
 				   CFARG_SUBMATCH, mainbus_find,
-				   CFARG_IATTR, "mainbus",
 				   CFARG_EOL);
 		if (cf == NULL && critical_devs[i].required)
 			panic("%s: failed to find %s",

Index: src/sys/arch/mips/rmi/rmixl_iobus.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.5.10.1 src/sys/arch/mips/rmi/rmixl_iobus.c:1.5.10.2
--- src/sys/arch/mips/rmi/rmixl_iobus.c:1.5.10.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/rmi/rmixl_iobus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_iobus.c,v 1.5.10.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: rmixl_iobus.c,v 1.5.10.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.5.10.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.5.10.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include "locators.h"
 
@@ -163,7 +163,6 @@ rmixl_iobus_attach(device_t parent, devi
 	/* attach any children */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, rmixl_iobus_search,
-	    CFARG_IATTR, "rmixl_iobus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.2 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.3
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.2	Sat Mar 20 20:49:43 2021
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_mainbus.c,v 1.4.68.2 2021/03/20 20:49:43 thorpej Exp $	*/
+/*	$NetBSD: rmixl_mainbus.c,v 1.4.68.3 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.4.68.2 2021/03/20 20:49:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.4.68.3 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,7 +93,6 @@ mainbusattach(device_t parent, device_t 
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mips/rmi/rmixl_obio.c
diff -u src/sys/arch/mips/rmi/rmixl_obio.c:1.5.68.1 src/sys/arch/mips/rmi/rmixl_obio.c:1.5.68.2
--- src/sys/arch/mips/rmi/rmixl_obio.c:1.5.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/rmi/rmixl_obio.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_obio.c,v 1.5.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: rmixl_obio.c,v 1.5.68.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.5.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c,v 1.5.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include "locators.h"
 #include "pci.h"
@@ -119,7 +119,6 @@ obio_attach(device_t parent, device_t se
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 
 }
Index: src/sys/arch/mips/rmi/rmixl_usbi.c
diff -u src/sys/arch/mips/rmi/rmixl_usbi.c:1.5.68.1 src/sys/arch/mips/rmi/rmixl_usbi.c:1.5.68.2
--- src/sys/arch/mips/rmi/rmixl_usbi.c:1.5.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/rmi/rmixl_usbi.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmixl_usbi.c,v 1.5.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: rmixl_usbi.c,v 1.5.68.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.5.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c,v 1.5.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include "locators.h"
 
@@ -166,7 +166,6 @@ rmixl_usbi_attach(device_t parent, devic
 	/* attach any children */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, rmixl_usbi_search,
-	    CFARG_IATTR, "rmixl_usbi",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mips/sibyte/dev/sbgbus.c
diff -u src/sys/arch/mips/sibyte/dev/sbgbus.c:1.13.68.1 src/sys/arch/mips/sibyte/dev/sbgbus.c:1.13.68.2
--- src/sys/arch/mips/sibyte/dev/sbgbus.c:1.13.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/sibyte/dev/sbgbus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sbgbus.c,v 1.13.68.1 2021/03/20 19:33:36 thorpej Exp $ */
+/* $NetBSD: sbgbus.c,v 1.13.68.2 2021/03/21 17:35:45 thorpej Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.13.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbgbus.c,v 1.13.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -76,7 +76,6 @@ sbgbus_attach(device_t parent, device_t 
 	/* Configure children using indirect configuration. */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, sbgbussearch,
-	    CFARG_IATTR, "sbgbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mipsco/obio/obio.c
diff -u src/sys/arch/mipsco/obio/obio.c:1.17.68.1 src/sys/arch/mipsco/obio/obio.c:1.17.68.2
--- src/sys/arch/mipsco/obio/obio.c:1.17.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mipsco/obio/obio.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.17.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.17.68.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include "locators.h"
 
@@ -88,7 +88,6 @@ obio_attach(device_t parent, device_t se
 	printf("\n");
 	config_search(self, ca,
 	    CFARG_SUBMATCH, obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/mmeye/mmeye/mainbus.c
diff -u src/sys/arch/mmeye/mmeye/mainbus.c:1.9.68.1 src/sys/arch/mmeye/mmeye/mainbus.c:1.9.68.2
--- src/sys/arch/mmeye/mmeye/mainbus.c:1.9.68.1	Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mmeye/mmeye/mainbus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.9.68.1 2021/03/20 19:33:36 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.9.68.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9.68.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9.68.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,6 @@ mainbus_attach(device_t parent, device_t
 	/* Devices */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/news68k/dev/hb.c
diff -u src/sys/arch/news68k/dev/hb.c:1.19.100.1 src/sys/arch/news68k/dev/hb.c:1.19.100.2
--- src/sys/arch/news68k/dev/hb.c:1.19.100.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/news68k/dev/hb.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hb.c,v 1.19.100.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: hb.c,v 1.19.100.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 Izumi Tsutsui.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.19.100.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.19.100.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,6 @@ hb_attach(device_t parent, device_t self
 
 	config_search(self, &ha,
 	    CFARG_SUBMATCH, hb_search,
-	    CFARG_IATTR, "hb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/news68k/news68k/mainbus.c
diff -u src/sys/arch/news68k/news68k/mainbus.c:1.16.70.1 src/sys/arch/news68k/news68k/mainbus.c:1.16.70.2
--- src/sys/arch/news68k/news68k/mainbus.c:1.16.70.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/news68k/news68k/mainbus.c	Sun Mar 21 17:35:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.16.70.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.16.70.2 2021/03/21 17:35:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.70.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.70.2 2021/03/21 17:35:45 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,7 +71,6 @@ mainbus_attach(device_t parent, device_t
 
 	config_search(self, &ma,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/newsmips/dev/hb.c
diff -u src/sys/arch/newsmips/dev/hb.c:1.21.2.1 src/sys/arch/newsmips/dev/hb.c:1.21.2.2
--- src/sys/arch/newsmips/dev/hb.c:1.21.2.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/newsmips/dev/hb.c	Sun Mar 21 17:35:46 2021
@@ -1,7 +1,7 @@
-/*	$NetBSD: hb.c,v 1.21.2.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: hb.c,v 1.21.2.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.21.2.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hb.c,v 1.21.2.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #define __INTR_PRIVATE
 #include <sys/param.h>
@@ -55,7 +55,6 @@ hb_attach(device_t parent, device_t self
 
 	config_search(self, &ha,
 	    CFARG_SUBMATCH, hb_search,
-	    CFARG_IATTR, "hb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/next68k/dev/intio.c
diff -u src/sys/arch/next68k/dev/intio.c:1.14.68.1 src/sys/arch/next68k/dev/intio.c:1.14.68.2
--- src/sys/arch/next68k/dev/intio.c:1.14.68.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/next68k/dev/intio.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: intio.c,v 1.14.68.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: intio.c,v 1.14.68.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.14.68.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.14.68.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,7 +80,6 @@ intioattach(device_t parent, device_t se
 	/* Search for and attach children. */
 	config_search(self, aux,
 	    CFARG_SUBMATCH, intiosearch,
-	    CFARG_IATTR, "intio",
 	    CFARG_EOL);
 
 	intio_attached = true;

Index: src/sys/arch/next68k/next68k/mainbus.c
diff -u src/sys/arch/next68k/next68k/mainbus.c:1.11.68.1 src/sys/arch/next68k/next68k/mainbus.c:1.11.68.2
--- src/sys/arch/next68k/next68k/mainbus.c:1.11.68.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/next68k/next68k/mainbus.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.11.68.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.11.68.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.68.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11.68.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -92,7 +92,6 @@ mainbus_attach(device_t parent, device_t
 	/* Search for and attach children. */
 	config_search(self, &mba,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 
 	mainbus_attached = 1;

Index: src/sys/arch/playstation2/dev/sbus.c
diff -u src/sys/arch/playstation2/dev/sbus.c:1.17.30.1 src/sys/arch/playstation2/dev/sbus.c:1.17.30.2
--- src/sys/arch/playstation2/dev/sbus.c:1.17.30.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/playstation2/dev/sbus.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbus.c,v 1.17.30.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: sbus.c,v 1.17.30.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.17.30.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.17.30.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -114,7 +114,6 @@ sbus_attach(device_t parent, device_t se
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, sbus_search,
-	    CFARG_IATTR, "sbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/playstation2/playstation2/mainbus.c
diff -u src/sys/arch/playstation2/playstation2/mainbus.c:1.16.30.1 src/sys/arch/playstation2/playstation2/mainbus.c:1.16.30.2
--- src/sys/arch/playstation2/playstation2/mainbus.c:1.16.30.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/playstation2/playstation2/mainbus.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.16.30.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.16.30.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.30.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16.30.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -63,7 +63,6 @@ mainbus_attach(device_t parent, device_t
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/powerpc/booke/dev/pq3obio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3obio.c:1.5.4.1 src/sys/arch/powerpc/booke/dev/pq3obio.c:1.5.4.2
--- src/sys/arch/powerpc/booke/dev/pq3obio.c:1.5.4.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/powerpc/booke/dev/pq3obio.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3obio.c,v 1.5.4.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: pq3obio.c,v 1.5.4.2 2021/03/21 17:35:46 thorpej Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -37,7 +37,7 @@
 #define	LBC_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.5.4.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3obio.c,v 1.5.4.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include "locators.h"
 
@@ -288,7 +288,6 @@ pq3obio_attach(device_t parent, device_t
 	locs[OBIOCF_CS] = OBIOCF_CS_DEFAULT;
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, pq3obio_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_LOCATORS, locs,
 	    CFARG_EOL);
 }

Index: src/sys/arch/prep/pnpbus/pnpbus.c
diff -u src/sys/arch/prep/pnpbus/pnpbus.c:1.13.2.1 src/sys/arch/prep/pnpbus/pnpbus.c:1.13.2.2
--- src/sys/arch/prep/pnpbus/pnpbus.c:1.13.2.1	Sat Mar 20 19:33:37 2021
+++ src/sys/arch/prep/pnpbus/pnpbus.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pnpbus.c,v 1.13.2.1 2021/03/20 19:33:37 thorpej Exp $	*/
+/*	$NetBSD: pnpbus.c,v 1.13.2.2 2021/03/21 17:35:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.13.2.1 2021/03/20 19:33:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1.13.2.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -95,7 +95,6 @@ pnpbus_attach(device_t parent, device_t 
 
 	config_search(self, aux,
 	    CFARG_SUBMATCH, pnpbus_search,
-	    CFARG_IATTR, "pnpbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/rs6000/mca/ioplanar.c
diff -u src/sys/arch/rs6000/mca/ioplanar.c:1.4.68.1 src/sys/arch/rs6000/mca/ioplanar.c:1.4.68.2
--- src/sys/arch/rs6000/mca/ioplanar.c:1.4.68.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/rs6000/mca/ioplanar.c	Sun Mar 21 17:35:46 2021
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.4.68.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioplanar.c,v 1.4.68.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -88,7 +88,6 @@ ioplanar_attach(device_t parent, device_
 
 	config_search(self, aux,
 	    CFARG_SUBMATCH, ioplanar_search,
-	    CFARG_IATTR, "ioplanar",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sandpoint/sandpoint/eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/eumb.c:1.6.62.1 src/sys/arch/sandpoint/sandpoint/eumb.c:1.6.62.2
--- src/sys/arch/sandpoint/sandpoint/eumb.c:1.6.62.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sandpoint/sandpoint/eumb.c	Sun Mar 21 17:35:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: eumb.c,v 1.6.62.1 2021/03/20 19:33:38 thorpej Exp $ */
+/* $NetBSD: eumb.c,v 1.6.62.2 2021/03/21 17:35:46 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.6.62.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.6.62.2 2021/03/21 17:35:46 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -71,7 +71,6 @@ eumb_attach(device_t parent, device_t se
 	aprint_normal("\n");
 	config_search(self, aux,
 	    CFARG_SUBMATCH, eumb_search,
-	    CFARG_IATTR, "eumb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sgimips/gio/gio.c
diff -u src/sys/arch/sgimips/gio/gio.c:1.36.10.1 src/sys/arch/sgimips/gio/gio.c:1.36.10.2
--- src/sys/arch/sgimips/gio/gio.c:1.36.10.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sgimips/gio/gio.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gio.c,v 1.36.10.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: gio.c,v 1.36.10.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.36.10.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.36.10.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include "opt_ddb.h"
 
@@ -273,7 +273,6 @@ gio_attach(device_t parent, device_t sel
 
 	config_search(self, &ga,
 	    CFARG_SUBMATCH, gio_search,
-	    CFARG_IATTR, "gio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sgimips/ioc/ioc.c
diff -u src/sys/arch/sgimips/ioc/ioc.c:1.11.32.1 src/sys/arch/sgimips/ioc/ioc.c:1.11.32.2
--- src/sys/arch/sgimips/ioc/ioc.c:1.11.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sgimips/ioc/ioc.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.11.32.1 2021/03/20 19:33:38 thorpej Exp $	 */
+/* $NetBSD: ioc.c,v 1.11.32.2 2021/03/21 17:35:47 thorpej Exp $	 */
 
 /*
  * Copyright (c) 2003 Christopher Sekiya
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.11.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.11.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -159,7 +159,6 @@ ioc_attach(device_t parent, device_t sel
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, ioc_search,
-	    CFARG_IATTR, "ioc",
 	    CFARG_EOL);
 #endif
 }

Index: src/sys/arch/sgimips/mace/mace.c
diff -u src/sys/arch/sgimips/mace/mace.c:1.23.32.1 src/sys/arch/sgimips/mace/mace.c:1.23.32.2
--- src/sys/arch/sgimips/mace/mace.c:1.23.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sgimips/mace/mace.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mace.c,v 1.23.32.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: mace.c,v 1.23.32.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2003 Christopher Sekiya
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.23.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.23.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -198,7 +198,6 @@ mace_attach(device_t parent, device_t se
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mace_search,
-	    CFARG_IATTR, "mace",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sgimips/sgimips/mainbus.c
diff -u src/sys/arch/sgimips/sgimips/mainbus.c:1.20.70.1 src/sys/arch/sgimips/sgimips/mainbus.c:1.20.70.2
--- src/sys/arch/sgimips/sgimips/mainbus.c:1.20.70.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sgimips/sgimips/mainbus.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.20.70.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.20.70.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20.70.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20.70.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,6 @@ mainbus_attach(device_t parent, device_t
 
 	config_search(self, &ma,
 	    CFARG_SUBMATCH, mainbus_search,
-	    CFARG_IATTR, "mainbus",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sh3/dev/adc.c
diff -u src/sys/arch/sh3/dev/adc.c:1.13.74.1 src/sys/arch/sh3/dev/adc.c:1.13.74.2
--- src/sys/arch/sh3/dev/adc.c:1.13.74.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sh3/dev/adc.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: adc.c,v 1.13.74.1 2021/03/20 19:33:38 thorpej Exp $ */
+/*	$NetBSD: adc.c,v 1.13.74.2 2021/03/21 17:35:47 thorpej Exp $ */
 
 /*
  * Copyright (c) 2003 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.13.74.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adc.c,v 1.13.74.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -81,7 +81,6 @@ adc_attach(device_t parent, device_t sel
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, adc_search,
-	    CFARG_IATTR, "adc",
 	    CFARG_EOL);
 
 	/*

Index: src/sys/arch/sh3/dev/shb.c
diff -u src/sys/arch/sh3/dev/shb.c:1.14.78.1 src/sys/arch/sh3/dev/shb.c:1.14.78.2
--- src/sys/arch/sh3/dev/shb.c:1.14.78.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sh3/dev/shb.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: shb.c,v 1.14.78.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: shb.c,v 1.14.78.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shb.c,v 1.14.78.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shb.c,v 1.14.78.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -66,7 +66,6 @@ shb_attach(device_t parent, device_t sel
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, shb_search,
-	    CFARG_IATTR, "shb",
 	    CFARG_EOL);
 
 	/*

Index: src/sys/arch/sparc/dev/obio.c
diff -u src/sys/arch/sparc/dev/obio.c:1.74.50.1 src/sys/arch/sparc/dev/obio.c:1.74.50.2
--- src/sys/arch/sparc/dev/obio.c:1.74.50.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sparc/dev/obio.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.74.50.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.74.50.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.74.50.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.74.50.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include "locators.h"
 
@@ -166,7 +166,6 @@ obioattach(device_t parent, device_t sel
 			oa.name = *cpp;
 			config_search(self, &oa,
 			    CFARG_SUBMATCH, obiosearch,
-			    CFARG_IATTR, "obio",
 			    CFARG_EOL);
 		}
 
@@ -174,7 +173,6 @@ obioattach(device_t parent, device_t sel
 		oa.name = NULL;
 		config_search(self, &oa,
 		    CFARG_SUBMATCH, obiosearch,
-		    CFARG_IATTR, "obio",
 		    CFARG_EOL);
 #endif
 		return;

Index: src/sys/arch/sun2/sun2/mbio.c
diff -u src/sys/arch/sun2/sun2/mbio.c:1.19.32.1 src/sys/arch/sun2/sun2/mbio.c:1.19.32.2
--- src/sys/arch/sun2/sun2/mbio.c:1.19.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sun2/sun2/mbio.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbio.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: mbio.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbio.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,7 +131,6 @@ mbio_attach(device_t parent, device_t se
 		mba.mba_name = *cpp;
 		config_search(self, &mba,
 		    CFARG_SUBMATCH, sun68k_bus_search,
-		    CFARG_IATTR, "mbio",
 		    CFARG_EOL);
 	}
 
@@ -139,7 +138,6 @@ mbio_attach(device_t parent, device_t se
 	mba.mba_name = NULL;
 	config_search(self, &mba,
 	    CFARG_SUBMATCH, sun68k_bus_search,
-	    CFARG_IATTR, "mbio",
 	    CFARG_EOL);
 }
 
Index: src/sys/arch/sun2/sun2/obio.c
diff -u src/sys/arch/sun2/sun2/obio.c:1.19.32.1 src/sys/arch/sun2/sun2/obio.c:1.19.32.2
--- src/sys/arch/sun2/sun2/obio.c:1.19.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sun2/sun2/obio.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +136,6 @@ obio_attach(device_t parent, device_t se
 		oba.oba_name = *cpp;
 		config_search(self, &oba,
 		    CFARG_SUBMATCH, sun68k_bus_search,
-		    CFARG_IATTR, "obio",
 		    CFARG_EOL);
 	}
 
@@ -144,7 +143,6 @@ obio_attach(device_t parent, device_t se
 	oba.oba_name = NULL;
 	config_search(self, &oba,
 	    CFARG_SUBMATCH, sun68k_bus_search,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 
Index: src/sys/arch/sun2/sun2/obmem.c
diff -u src/sys/arch/sun2/sun2/obmem.c:1.19.32.1 src/sys/arch/sun2/sun2/obmem.c:1.19.32.2
--- src/sys/arch/sun2/sun2/obmem.c:1.19.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sun2/sun2/obmem.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: obmem.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.19.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.19.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -126,7 +126,6 @@ obmem_attach(device_t parent, device_t s
 		obma.obma_name = *cpp;
 		config_search(self, &obma,
 		    CFARG_SUBMATCH, sun68k_bus_search,
-		    CFARG_IATTR, "obmem",
 		    CFARG_EOL);
 	}
 
@@ -134,7 +133,6 @@ obmem_attach(device_t parent, device_t s
 	obma.obma_name = NULL;
 	config_search(self, &obma,
 	    CFARG_SUBMATCH, sun68k_bus_search,
-	    CFARG_IATTR, "obmem",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sun2/sun2/mbmem.c
diff -u src/sys/arch/sun2/sun2/mbmem.c:1.20.32.1 src/sys/arch/sun2/sun2/mbmem.c:1.20.32.2
--- src/sys/arch/sun2/sun2/mbmem.c:1.20.32.1	Sat Mar 20 19:33:38 2021
+++ src/sys/arch/sun2/sun2/mbmem.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mbmem.c,v 1.20.32.1 2021/03/20 19:33:38 thorpej Exp $	*/
+/*	$NetBSD: mbmem.c,v 1.20.32.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.20.32.1 2021/03/20 19:33:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mbmem.c,v 1.20.32.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,7 +145,6 @@ mbmem_attach(device_t parent, device_t s
 		mbma.mbma_name = *cpp;
 		config_search(self, &mbma,
 		    CFARG_SUBMATCH, sun68k_bus_search,
-		    CFARG_IATTR, "mbmem",
 		    CFARG_EOL);
 	}
 
@@ -153,7 +152,6 @@ mbmem_attach(device_t parent, device_t s
 	mbma.mbma_name = NULL;
 	config_search(self, &mbma,
 	    CFARG_SUBMATCH, sun68k_bus_search,
-	    CFARG_IATTR, "mbmem",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sun3/sun3/obmem.c
diff -u src/sys/arch/sun3/sun3/obmem.c:1.27.44.1 src/sys/arch/sun3/sun3/obmem.c:1.27.44.2
--- src/sys/arch/sun3/sun3/obmem.c:1.27.44.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/sun3/sun3/obmem.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obmem.c,v 1.27.44.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: obmem.c,v 1.27.44.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.27.44.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obmem.c,v 1.27.44.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,7 +120,6 @@ obmem_attach(device_t parent, device_t s
 	/* We know ca_bustype == BUS_OBMEM */
 	config_search(self, &obma,
 	    CFARG_SUBMATCH, bus_scan,
-	    CFARG_IATTR, "obmem",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sun3/sun3/vme.c
diff -u src/sys/arch/sun3/sun3/vme.c:1.22.44.1 src/sys/arch/sun3/sun3/vme.c:1.22.44.2
--- src/sys/arch/sun3/sun3/vme.c:1.22.44.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/sun3/sun3/vme.c	Sun Mar 21 17:35:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme.c,v 1.22.44.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: vme.c,v 1.22.44.2 2021/03/21 17:35:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22.44.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22.44.2 2021/03/21 17:35:47 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,7 +155,6 @@ vme_attach(device_t parent, device_t sel
 	/* We know ca_bustype == BUS_VMExx */
 	config_search(self, &vmea,
 	    CFARG_SUBMATCH, bus_scan,
-	    CFARG_IATTR, "vme",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/sun3/sun3x/vme.c
diff -u src/sys/arch/sun3/sun3x/vme.c:1.17.44.1 src/sys/arch/sun3/sun3x/vme.c:1.17.44.2
--- src/sys/arch/sun3/sun3x/vme.c:1.17.44.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/sun3/sun3x/vme.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vme.c,v 1.17.44.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: vme.c,v 1.17.44.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17.44.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17.44.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,7 +155,6 @@ vme_attach(device_t parent, device_t sel
 	/* We know ca_bustype == BUS_VMExx */
 	config_search(self, args,
 	    CFARG_SUBMATCH, bus_scan,
-	    CFARG_IATTR, "vme",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.65.14.1 src/sys/arch/vax/vsa/vsbus.c:1.65.14.2
--- src/sys/arch/vax/vsa/vsbus.c:1.65.14.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/vax/vsa/vsbus.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsbus.c,v 1.65.14.1 2021/03/20 19:33:39 thorpej Exp $ */
+/*	$NetBSD: vsbus.c,v 1.65.14.2 2021/03/21 17:35:48 thorpej Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.65.14.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.65.14.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include "opt_cputype.h"
 
@@ -172,7 +172,6 @@ vsbus_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vsbus_search,
-	    CFARG_IATTR, "vsbus",
 	    CFARG_EOL);
 
 	/* Autoconfig finished, enable interrupts */

Index: src/sys/arch/x68k/dev/grf_machdep.c
diff -u src/sys/arch/x68k/dev/grf_machdep.c:1.32.52.1 src/sys/arch/x68k/dev/grf_machdep.c:1.32.52.2
--- src/sys/arch/x68k/dev/grf_machdep.c:1.32.52.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x68k/dev/grf_machdep.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_machdep.c,v 1.32.52.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: grf_machdep.c,v 1.32.52.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991 University of Utah.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.32.52.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_machdep.c,v 1.32.52.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include "locators.h"
 
@@ -94,7 +94,6 @@ grfbusattach(device_t parent, device_t s
 	aprint_normal("\n");
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, grfbussearch,
-	    CFARG_IATTR, "grfb",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.47.4.1 src/sys/arch/x68k/dev/intio.c:1.47.4.2
--- src/sys/arch/x68k/dev/intio.c:1.47.4.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x68k/dev/intio.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: intio.c,v 1.47.4.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: intio.c,v 1.47.4.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.47.4.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.47.4.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -177,7 +177,6 @@ intio_attach(device_t parent, device_t s
 
 	config_search(self, &ia,
 	    CFARG_SUBMATCH, intio_search,
-	    CFARG_IATTR, "intio",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/x68k/dev/mfp.c
diff -u src/sys/arch/x68k/dev/mfp.c:1.27.10.1 src/sys/arch/x68k/dev/mfp.c:1.27.10.2
--- src/sys/arch/x68k/dev/mfp.c:1.27.10.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x68k/dev/mfp.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfp.c,v 1.27.10.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: mfp.c,v 1.27.10.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.27.10.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.27.10.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,7 +109,6 @@ mfp_attach(device_t parent, device_t sel
 	bus_space_map(ia->ia_bst, ia->ia_addr, 0x2000, 0, &sc->sc_bht);
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, mfp_search,
-	    CFARG_IATTR, "mfp",
 	    CFARG_EOL);
 }
 

Index: src/sys/arch/x68k/dev/neptune.c
diff -u src/sys/arch/x68k/dev/neptune.c:1.21.10.1 src/sys/arch/x68k/dev/neptune.c:1.21.10.2
--- src/sys/arch/x68k/dev/neptune.c:1.21.10.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x68k/dev/neptune.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: neptune.c,v 1.21.10.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: neptune.c,v 1.21.10.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.21.10.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.21.10.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,7 +119,6 @@ neptune_attach(device_t parent, device_t
 
 	cf = config_search(self, &na,
 	    CFARG_SUBMATCH, neptune_search,
-	    CFARG_IATTR, "neptune",
 	    CFARG_EOL);
 	if (cf) {
 		aprint_normal(": Neptune-X ISA bridge\n");

Index: src/sys/arch/x68k/dev/scsirom.c
diff -u src/sys/arch/x68k/dev/scsirom.c:1.20.44.1 src/sys/arch/x68k/dev/scsirom.c:1.20.44.2
--- src/sys/arch/x68k/dev/scsirom.c:1.20.44.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x68k/dev/scsirom.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsirom.c,v 1.20.44.1 2021/03/20 19:33:39 thorpej Exp $	*/
+/*	$NetBSD: scsirom.c,v 1.20.44.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.20.44.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.20.44.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -157,7 +157,6 @@ scsirom_attach(device_t parent, device_t
 		aprint_normal(": External at %p\n", (void *)ia->ia_addr);
 
 	cf = config_search(self, ia,
-	    CFARG_IATTR, "scsirom",
 	    CFARG_EOL);
 	if (cf) {
 		config_attach(self, cf, ia, NULL);

Index: src/sys/arch/x86/pci/amdnb_misc.c
diff -u src/sys/arch/x86/pci/amdnb_misc.c:1.3.14.1 src/sys/arch/x86/pci/amdnb_misc.c:1.3.14.2
--- src/sys/arch/x86/pci/amdnb_misc.c:1.3.14.1	Sat Mar 20 19:33:39 2021
+++ src/sys/arch/x86/pci/amdnb_misc.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdnb_misc.c,v 1.3.14.1 2021/03/20 19:33:39 thorpej Exp $ */
+/*	$NetBSD: amdnb_misc.c,v 1.3.14.2 2021/03/21 17:35:48 thorpej Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.3.14.1 2021/03/20 19:33:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdnb_misc.c,v 1.3.14.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -135,7 +135,6 @@ amdnb_misc_attach(device_t parent, devic
 
 	config_search(self, &sc->sc_pa,
 	    CFARG_SUBMATCH, amdnb_misc_search,
-	    CFARG_IATTR, "amdnb_miscbus",
 	    CFARG_EOL);
 
 	return;

Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.13.62.2 src/sys/arch/zaurus/dev/zssp.c:1.13.62.3
--- src/sys/arch/zaurus/dev/zssp.c:1.13.62.2	Sat Mar 20 20:47:53 2021
+++ src/sys/arch/zaurus/dev/zssp.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: zssp.c,v 1.13.62.2 2021/03/20 20:47:53 thorpej Exp $	*/
+/*	$NetBSD: zssp.c,v 1.13.62.3 2021/03/21 17:35:48 thorpej Exp $	*/
 /*	$OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.13.62.2 2021/03/20 20:47:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.13.62.3 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -146,7 +146,6 @@ zssp_attach(device_t parent, device_t se
 	/* Attach all devices */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, zssp_search,
-	    CFARG_IATTR, "zssp",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/gpib/cs80bus.c
diff -u src/sys/dev/gpib/cs80bus.c:1.17.34.1 src/sys/dev/gpib/cs80bus.c:1.17.34.2
--- src/sys/dev/gpib/cs80bus.c:1.17.34.1	Sat Mar 20 19:33:40 2021
+++ src/sys/dev/gpib/cs80bus.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs80bus.c,v 1.17.34.1 2021/03/20 19:33:40 thorpej Exp $	*/
+/*	$NetBSD: cs80bus.c,v 1.17.34.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.17.34.1 2021/03/20 19:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.17.34.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -136,7 +136,6 @@ cs80busattach(device_t parent, device_t 
 
 		config_search(sc->sc_dev, &ca,
 		    CFARG_SUBMATCH, cs80bussearch,
-		    CFARG_IATTR, "cs80bus",
 		    CFARG_EOL);
 	}
 }

Index: src/sys/dev/gpib/gpib.c
diff -u src/sys/dev/gpib/gpib.c:1.24.10.1 src/sys/dev/gpib/gpib.c:1.24.10.2
--- src/sys/dev/gpib/gpib.c:1.24.10.1	Sat Mar 20 19:33:40 2021
+++ src/sys/dev/gpib/gpib.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gpib.c,v 1.24.10.1 2021/03/20 19:33:40 thorpej Exp $	*/
+/*	$NetBSD: gpib.c,v 1.24.10.2 2021/03/21 17:35:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.24.10.1 2021/03/20 19:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.24.10.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -142,7 +142,6 @@ gpibattach(device_t parent, device_t sel
 		ga.ga_address = address;
 		config_search(sc->sc_dev, &ga,
 		    CFARG_SUBMATCH, gpibsubmatch1,
-		    CFARG_IATTR, "gpib",
 		    CFARG_EOL);
 	}
 
@@ -150,7 +149,6 @@ gpibattach(device_t parent, device_t sel
 	ga.ga_ic = sc->sc_ic;
 	config_search(sc->sc_dev, &ga,
 	    CFARG_SUBMATCH, gpibsubmatch2,
-	    CFARG_IATTR, "gpib",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.64.10.2 src/sys/dev/gpio/gpio.c:1.64.10.3
--- src/sys/dev/gpio/gpio.c:1.64.10.2	Sat Mar 20 20:47:53 2021
+++ src/sys/dev/gpio/gpio.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.64.10.2 2021/03/20 20:47:53 thorpej Exp $ */
+/* $NetBSD: gpio.c,v 1.64.10.3 2021/03/21 17:35:48 thorpej Exp $ */
 /*	$OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.64.10.2 2021/03/20 20:47:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.64.10.3 2021/03/21 17:35:48 thorpej Exp $");
 
 /*
  * General Purpose Input/Output framework.
@@ -857,7 +857,6 @@ gpio_ioctl(struct gpio_softc *sc, u_long
 		locs[GPIOCF_FLAG] = ga.ga_flags;
 
 		cf = config_search(sc->sc_dev, &ga,
-		    CFARG_IATTR, "gpio",
 		    CFARG_LOCATORS, locs,
 		    CFARG_EOL);
 		if (cf != NULL) {

Index: src/sys/dev/hpc/hpcioman.c
diff -u src/sys/dev/hpc/hpcioman.c:1.19.54.1 src/sys/dev/hpc/hpcioman.c:1.19.54.2
--- src/sys/dev/hpc/hpcioman.c:1.19.54.1	Sat Mar 20 19:33:40 2021
+++ src/sys/dev/hpc/hpcioman.c	Sun Mar 21 17:35:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcioman.c,v 1.19.54.1 2021/03/20 19:33:40 thorpej Exp $ */
+/*	$NetBSD: hpcioman.c,v 1.19.54.2 2021/03/21 17:35:48 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.19.54.1 2021/03/20 19:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.19.54.2 2021/03/21 17:35:48 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,6 @@ hpcioman_attach(device_t parent, device_
 
 	config_search(self, aux,
 	    CFARG_SUBMATCH, hpcioman_search,
-	    CFARG_IATTR, "hpcioman",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/isa/tsdio.c
diff -u src/sys/dev/isa/tsdio.c:1.11.54.1 src/sys/dev/isa/tsdio.c:1.11.54.2
--- src/sys/dev/isa/tsdio.c:1.11.54.1	Sat Mar 20 19:33:40 2021
+++ src/sys/dev/isa/tsdio.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsdio.c,v 1.11.54.1 2021/03/20 19:33:40 thorpej Exp $	*/
+/*	$NetBSD: tsdio.c,v 1.11.54.2 2021/03/21 17:35:49 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.11.54.1 2021/03/20 19:33:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.11.54.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -124,7 +124,6 @@ tsdio_attach(device_t parent, device_t s
 	 */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, tsdio_search,
-	    CFARG_IATTR, "tsdio",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/marvell/obio.c
diff -u src/sys/dev/marvell/obio.c:1.15.76.1 src/sys/dev/marvell/obio.c:1.15.76.2
--- src/sys/dev/marvell/obio.c:1.15.76.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/marvell/obio.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.15.76.1 2021/03/20 19:33:41 thorpej Exp $	*/
+/*	$NetBSD: obio.c,v 1.15.76.2 2021/03/21 17:35:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15.76.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.15.76.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include "opt_marvell.h"
 
@@ -139,7 +139,6 @@ obio_attach(device_t parent, device_t se
 
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, obio_cfsearch,
-	    CFARG_IATTR, "obio",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/qbus/uba.c
diff -u src/sys/dev/qbus/uba.c:1.81.10.1 src/sys/dev/qbus/uba.c:1.81.10.2
--- src/sys/dev/qbus/uba.c:1.81.10.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/qbus/uba.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uba.c,v 1.81.10.1 2021/03/20 19:33:41 thorpej Exp $	   */
+/*	$NetBSD: uba.c,v 1.81.10.2 2021/03/21 17:35:49 thorpej Exp $	   */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.81.10.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.81.10.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -268,7 +268,6 @@ uba_attach(struct uba_softc *sc, paddr_t
 	 */
 	config_search(sc->uh_dev, NULL,
 	    CFARG_SUBMATCH, ubasearch,
-	    CFARG_IATTR, "uba",
 	    CFARG_EOL);
 
 	if (sc->uh_afterscan)

Index: src/sys/dev/scsipi/atapiconf.c
diff -u src/sys/dev/scsipi/atapiconf.c:1.91.22.1 src/sys/dev/scsipi/atapiconf.c:1.91.22.2
--- src/sys/dev/scsipi/atapiconf.c:1.91.22.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/scsipi/atapiconf.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: atapiconf.c,v 1.91.22.1 2021/03/20 19:33:41 thorpej Exp $	*/
+/*	$NetBSD: atapiconf.c,v 1.91.22.2 2021/03/21 17:35:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.91.22.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.91.22.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -280,7 +280,6 @@ atapi_probe_device(struct atapibus_softc
 
 	if ((cf = config_search(sc->sc_dev, sa,
 				CFARG_SUBMATCH, atapibussubmatch,
-				CFARG_IATTR, "atapibus",
 				CFARG_EOL)) != NULL) {
 		scsipi_insert_periph(chan, periph);
 		/*

Index: src/sys/dev/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.290.4.1 src/sys/dev/scsipi/scsiconf.c:1.290.4.2
--- src/sys/dev/scsipi/scsiconf.c:1.290.4.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/scsipi/scsiconf.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsiconf.c,v 1.290.4.1 2021/03/20 19:33:41 thorpej Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.290.4.2 2021/03/21 17:35:49 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.290.4.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.290.4.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1015,7 +1015,6 @@ scsi_probe_device(struct scsibus_softc *
 
 	if ((cf = config_search(sc->sc_dev, &sa,
 				CFARG_SUBMATCH, config_stdsubmatch,
-				CFARG_IATTR, "scsibus",
 				CFARG_LOCATORS, locs,
 				CFARG_EOL)) != NULL) {
 		scsipi_insert_periph(chan, periph);

Index: src/sys/dev/spi/spi.c
diff -u src/sys/dev/spi/spi.c:1.16.2.1 src/sys/dev/spi/spi.c:1.16.2.2
--- src/sys/dev/spi/spi.c:1.16.2.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/spi/spi.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spi.c,v 1.16.2.1 2021/03/20 19:33:41 thorpej Exp $ */
+/* $NetBSD: spi.c,v 1.16.2.2 2021/03/21 17:35:49 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.16.2.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.16.2.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include "locators.h"
 
@@ -316,7 +316,6 @@ spi_attach(device_t parent, device_t sel
 	/* Then do any other devices the user may have manually wired */
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, spi_search,
-	    CFARG_IATTR, "spi",
 	    CFARG_EOL);
 }
 

Index: src/sys/dev/vme/vme.c
diff -u src/sys/dev/vme/vme.c:1.27.4.1 src/sys/dev/vme/vme.c:1.27.4.2
--- src/sys/dev/vme/vme.c:1.27.4.1	Sat Mar 20 19:33:41 2021
+++ src/sys/dev/vme/vme.c	Sun Mar 21 17:35:49 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.27.4.1 2021/03/20 19:33:41 thorpej Exp $ */
+/* $NetBSD: vme.c,v 1.27.4.2 2021/03/21 17:35:49 thorpej Exp $ */
 
 /*
  * Copyright (c) 1999
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.27.4.1 2021/03/20 19:33:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.27.4.2 2021/03/21 17:35:49 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -203,12 +203,10 @@ vmeattach(device_t parent, device_t self
 		 if present */
 		config_search(self, NULL,
 		    CFARG_SUBMATCH, vmesubmatch1,
-		    CFARG_IATTR, "vme",
 		    CFARG_EOL);
 	}
 	config_search(self, NULL,
 	    CFARG_SUBMATCH, vmesubmatch,
-	    CFARG_IATTR, "vme",
 	    CFARG_EOL);
 
 #ifdef VMEDEBUG

Reply via email to