[src/thorpej-cfargs]: src/sys/dev/pci - config_found_ia() -> config_found().

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/154acf63d97c
branches:  thorpej-cfargs
changeset: 953981:154acf63d97c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Mar 27 01:41:43 2021 +0000

description:
- config_found_ia() -> config_found().
- virtio only carries a single interface attribute, so no need to
  specify it explicitly.

diffstat:

 sys/arch/evbmips/mipssim/virtio_mainbus.c |  10 +++++-----
 sys/dev/acpi/virtio_acpi.c                |   6 +++---
 sys/dev/fdt/virtio_mmio_fdt.c             |   8 ++++----
 sys/dev/pci/virtio_pci.c                  |  10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diffs (149 lines):

diff -r 6e97fd183344 -r 154acf63d97c sys/arch/evbmips/mipssim/virtio_mainbus.c
--- a/sys/arch/evbmips/mipssim/virtio_mainbus.c Fri Mar 26 02:05:02 2021 +0000
+++ b/sys/arch/evbmips/mipssim/virtio_mainbus.c Sat Mar 27 01:41:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mainbus.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $ */
+/* $NetBSD: virtio_mainbus.c,v 1.1.2.1 2021/03/27 01:41:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mainbus.c,v 1.1.2.1 2021/03/27 01:41:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -108,13 +108,13 @@
        if (virtio_mmio_common_probe_present(msc))
                virtio_mmio_common_attach(msc);
 
-       virtio_mainbus_rescan(self, "virtio", NULL);
+       virtio_mainbus_rescan(self, NULL, NULL);
 }
 
 
 /* ARGSUSED */
 static int
-virtio_mainbus_rescan(device_t self, const char *attr, const int *scan_flags)
+virtio_mainbus_rescan(device_t self, const char *ifattr, const int *locs)
 {
        struct virtio_mainbus_softc *sc = device_private(self);
        struct virtio_mmio_softc *msc = &sc->sc_msc;
@@ -127,7 +127,7 @@
        memset(&va, 0, sizeof(va));
        va.sc_childdevid = vsc->sc_childdevid;
 
-       config_found_ia(self, attr, &va, NULL);
+       config_found(self, &va, NULL, CFARG_EOL);
 
        if (virtio_attach_failed(vsc))
                return 0;
diff -r 6e97fd183344 -r 154acf63d97c sys/dev/acpi/virtio_acpi.c
--- a/sys/dev/acpi/virtio_acpi.c        Fri Mar 26 02:05:02 2021 +0000
+++ b/sys/dev/acpi/virtio_acpi.c        Sat Mar 27 01:41:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.7 2021/01/29 15:49:55 thorpej Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.7 2021/01/29 15:49:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -160,7 +160,7 @@
        memset(&va, 0, sizeof(va));
        va.sc_childdevid = vsc->sc_childdevid;
 
-       config_found_ia(self, ifattr, &va, NULL);
+       config_found(self, &va, NULL, CFARG_EOL);
 
        if (virtio_attach_failed(vsc))
                return 0;
diff -r 6e97fd183344 -r 154acf63d97c sys/dev/fdt/virtio_mmio_fdt.c
--- a/sys/dev/fdt/virtio_mmio_fdt.c     Fri Mar 26 02:05:02 2021 +0000
+++ b/sys/dev/fdt/virtio_mmio_fdt.c     Sat Mar 27 01:41:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_mmio_fdt.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: virtio_mmio_fdt.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_mmio_fdt.c,v 1.7.2.1 2021/03/27 01:41:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,7 +105,7 @@
        msc->sc_free_interrupts = virtio_mmio_fdt_free_interrupts;
 
        virtio_mmio_common_attach(msc);
-       virtio_mmio_fdt_rescan(self, "virtio", NULL);
+       virtio_mmio_fdt_rescan(self, NULL, NULL);
 }
 
 /* ARGSUSED */
@@ -123,7 +123,7 @@
        memset(&va, 0, sizeof(va));
        va.sc_childdevid = vsc->sc_childdevid;
 
-       config_found_ia(self, attr, &va, NULL);
+       config_found(self, &va, NULL, CFARG_EOL);
 
        if (virtio_attach_failed(vsc))
                return 0;
diff -r 6e97fd183344 -r 154acf63d97c sys/dev/pci/virtio_pci.c
--- a/sys/dev/pci/virtio_pci.c  Fri Mar 26 02:05:02 2021 +0000
+++ b/sys/dev/pci/virtio_pci.c  Sat Mar 27 01:41:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_pci.c,v 1.28 2021/02/05 19:18:23 reinoud Exp $ */
+/* $NetBSD: virtio_pci.c,v 1.28.2.1 2021/03/27 01:41:43 thorpej Exp $ */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.28 2021/02/05 19:18:23 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_pci.c,v 1.28.2.1 2021/03/27 01:41:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -271,13 +271,13 @@
 
        sc->sc_childdevid = id;
        sc->sc_child = NULL;
-       virtio_pci_rescan(self, "virtio", 0);
+       virtio_pci_rescan(self, NULL, NULL);
        return;
 }
 
 /* ARGSUSED */
 static int
-virtio_pci_rescan(device_t self, const char *attr, const int *scan_flags)
+virtio_pci_rescan(device_t self, const char *ifattr, const int *locs)
 {
        struct virtio_pci_softc * const psc = device_private(self);
        struct virtio_softc * const sc = &psc->sc_sc;
@@ -289,7 +289,7 @@
        memset(&va, 0, sizeof(va));
        va.sc_childdevid = sc->sc_childdevid;
 
-       config_found_ia(self, attr, &va, NULL);
+       config_found(self, &va, NULL, CFARG_EOL);
 
        if (virtio_attach_failed(sc))
                return 0;