[src/thorpej-cfargs]: src/sys/dev/pci Correct the names of the arguments pass...

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

details:   https://anonhg.NetBSD.org/src/rev/d186f4a28059
branches:  thorpej-cfargs
changeset: 1019739:d186f4a28059
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Mar 28 20:36:16 2021 +0000

description:
Correct the names of the arguments passed to the rescan function.

diffstat:

 sys/dev/pci/aac_pci.c |  6 +++---
 sys/dev/pci/amr.c     |  8 ++++----
 sys/dev/pci/mlx_pci.c |  6 +++---
 sys/dev/pci/twe.c     |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (126 lines):

diff -r c0850ca6d077 -r d186f4a28059 sys/dev/pci/aac_pci.c
--- a/sys/dev/pci/aac_pci.c     Sun Mar 28 20:35:57 2021 +0000
+++ b/sys/dev/pci/aac_pci.c     Sun Mar 28 20:36:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $    */
+/*     $NetBSD: aac_pci.c,v 1.40.14.1 2021/03/28 20:36:16 thorpej Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.40.14.1 2021/03/28 20:36:16 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -617,7 +617,7 @@
 
 /* ARGSUSED */
 static int
-aac_pci_rescan(device_t self, const char *attr, const int *flags)
+aac_pci_rescan(device_t self, const char *ifattr, const int *locs)
 {
 
        return aac_devscan(device_private(self));
diff -r c0850ca6d077 -r d186f4a28059 sys/dev/pci/amr.c
--- a/sys/dev/pci/amr.c Sun Mar 28 20:35:57 2021 +0000
+++ b/sys/dev/pci/amr.c Sun Mar 28 20:36:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amr.c,v 1.65.10.2 2021/03/22 16:23:45 thorpej Exp $    */
+/*     $NetBSD: amr.c,v 1.65.10.3 2021/03/28 20:36:40 thorpej Exp $    */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.65.10.2 2021/03/22 16:23:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.65.10.3 2021/03/28 20:36:40 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -511,7 +511,7 @@
 }
 
 static int
-amr_rescan(device_t self, const char *attr, const int *flags)
+amr_rescan(device_t self, const char *ifattr, const int *ulocs)
 {
        int j;
        int locs[AMRCF_NLOCS];
@@ -531,7 +531,7 @@
                amr->amr_drive[j].al_dv =
                    config_found(amr->amr_dv, &amra, amr_print,
                                 CFARG_SUBMATCH, config_stdsubmatch,
-                                CFARG_IATTR, attr,
+                                CFARG_IATTR, ifattr,
                                 CFARG_LOCATORS, locs,
                                 CFARG_EOL);
        }
diff -r c0850ca6d077 -r d186f4a28059 sys/dev/pci/mlx_pci.c
--- a/sys/dev/pci/mlx_pci.c     Sun Mar 28 20:35:57 2021 +0000
+++ b/sys/dev/pci/mlx_pci.c     Sun Mar 28 20:36:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $    */
+/*     $NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -145,7 +145,7 @@
 };
 
 static int
-mlx_pci_rescan(device_t self, const char *attr, const int *flag)
+mlx_pci_rescan(device_t self, const char *ifattr, const int *locs)
 {
 
        return mlx_configure(device_private(self), 1);
diff -r c0850ca6d077 -r d186f4a28059 sys/dev/pci/twe.c
--- a/sys/dev/pci/twe.c Sun Mar 28 20:35:57 2021 +0000
+++ b/sys/dev/pci/twe.c Sun Mar 28 20:36:16 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $   */
+/*     $NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $   */
 
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -451,7 +451,7 @@
        twe_describe_controller(sc);
 
        /* Find and attach RAID array units. */
-       twe_rescan(self, "twe", 0);
+       twe_rescan(self, NULL, NULL);
 
        /* ...and finally, enable interrupts. */
        twe_outl(sc, TWE_REG_CTL, TWE_CTL_CLEAR_ATTN_INTR |
@@ -482,7 +482,7 @@
 }
 
 static int
-twe_rescan(device_t self, const char *attr, const int *flags)
+twe_rescan(device_t self, const char *ifattr, const int *locs)
 {
        struct twe_softc *sc;
        int i;