Source-Changes-HG archive

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

[src/thorpej-cfargs]: src/sys/arch Don't pass the autoconfig print routine as...



details:   https://anonhg.NetBSD.org/src/rev/509e18107118
branches:  thorpej-cfargs
changeset: 981662:509e18107118
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Mar 20 20:49:43 2021 +0000

description:
Don't pass the autoconfig print routine as the aux pointer to the
indirect search routine.  That argument slot is meant for "attach
args" structures, not function pointers.  Besides, no one actually
used it anyway.

diffstat:

 sys/arch/hpcmips/dev/plum.c       |   8 ++++----
 sys/arch/hpcmips/dev/plumiobus.c  |   6 +++---
 sys/arch/hpcmips/dev/ucb1200.c    |   6 +++---
 sys/arch/hpcmips/tx/tx39sib.c     |   6 +++---
 sys/arch/hpcmips/tx/tx39spi.c     |   6 +++---
 sys/arch/hpcmips/tx/tx39uart.c    |   6 +++---
 sys/arch/hpcmips/tx/txcsbus.c     |   8 ++++----
 sys/arch/hpcmips/tx/txsim.c       |  10 +++++-----
 sys/arch/hpcmips/vr/vrc4173bcu.c  |   6 +++---
 sys/arch/hpcmips/vr/vrip.c        |   8 ++++----
 sys/arch/mips/rmi/rmixl_mainbus.c |   6 +++---
 11 files changed, 38 insertions(+), 38 deletions(-)

diffs (truncated from 340 to 300 lines):

diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/dev/plum.c
--- a/sys/arch/hpcmips/dev/plum.c       Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/dev/plum.c       Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plum.c,v 1.18.2.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: plum.c,v 1.18.2.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plum.c,v 1.18.2.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,7 +112,7 @@
         * attach first.
         */
        sc->sc_pri = 2;
-       config_search(self, plum_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, plum_search,
            CFARG_IATTR, "plumif",
            CFARG_EOL);
@@ -121,7 +121,7 @@
         * Other plum module.
         */
        sc->sc_pri = 1;
-       config_search(self, plum_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, plum_search,
            CFARG_IATTR, "plumif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/dev/plumiobus.c
--- a/sys/arch/hpcmips/dev/plumiobus.c  Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/dev/plumiobus.c  Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plumiobus.c,v 1.16.2.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: plumiobus.c,v 1.16.2.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumiobus.c,v 1.16.2.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #define PLUMIOBUSDEBUG
 
@@ -163,7 +163,7 @@
        plumiobus_dump(sc);
 #endif
 
-       config_search(self, plumiobus_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, plumiobus_search,
            CFARG_IATTR, "plumiobusif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/dev/ucb1200.c
--- a/sys/arch/hpcmips/dev/ucb1200.c    Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/dev/ucb1200.c    Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ucb1200.c,v 1.19.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: ucb1200.c,v 1.19.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucb1200.c,v 1.19.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -133,7 +133,7 @@
        (void)ucb1200_check_id(reg, 1);
        printf("\n");
 
-       config_search(self, ucb1200_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, ucb1200_search,
            CFARG_IATTR, "ucbif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/tx/tx39sib.c
--- a/sys/arch/hpcmips/tx/tx39sib.c     Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/tx/tx39sib.c     Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39sib.c,v 1.21.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: tx39sib.c,v 1.21.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39sib.c,v 1.21.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #undef TX39SIBDEBUG
 
@@ -177,7 +177,7 @@
                tx39sib_dump(sc);
 #endif 
 
-       config_search(self, tx39sib_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, tx39sib_search,
            CFARG_IATTR, "txsibif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/tx/tx39spi.c
--- a/sys/arch/hpcmips/tx/tx39spi.c     Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/tx/tx39spi.c     Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39spi.c,v 1.5.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: tx39spi.c,v 1.5.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39spi.c,v 1.5.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -87,7 +87,7 @@
 #endif
        printf("\n");
 
-       config_search(self, tx39spi_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, tx39spi_search,
            CFARG_IATTR, "txspiif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/tx/tx39uart.c
--- a/sys/arch/hpcmips/tx/tx39uart.c    Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/tx/tx39uart.c    Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39uart.c,v 1.15.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: tx39uart.c,v 1.15.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39uart.c,v 1.15.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include "opt_tx39uart_debug.h"
 
@@ -75,7 +75,7 @@
        printf("\n");
        sc->sc_tc = tc = ta->ta_tc;
 
-       config_search(self, tx39uart_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, tx39uart_search,
            CFARG_IATTR, "txcomif",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/tx/txcsbus.c
--- a/sys/arch/hpcmips/tx/txcsbus.c     Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/tx/txcsbus.c     Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: txcsbus.c,v 1.22.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: txcsbus.c,v 1.22.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txcsbus.c,v 1.22.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -143,14 +143,14 @@
         */
        /* higher priority devices attach first */
        sc->sc_pri = 2;
-       config_search(self, txcsbus_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, txcsbus_search,
            CFARG_IATTR, "txcsbus",
            CFARG_EOL);
 
        /* then, normal priority devices */
        sc->sc_pri = 1;
-       config_search(self, txcsbus_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, txcsbus_search,
            CFARG_IATTR, "txcsbus",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/tx/txsim.c
--- a/sys/arch/hpcmips/tx/txsim.c       Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/tx/txsim.c       Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: txsim.c,v 1.17.52.1 2021/03/20 19:33:35 thorpej Exp $ */
+/*     $NetBSD: txsim.c,v 1.17.52.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: txsim.c,v 1.17.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -90,7 +90,7 @@
         * so attach first.
         */
        sc->sc_pri = ATTACH_FIRST;
-       config_search(self, txsim_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, txsim_search,
            CFARG_IATTR, "txsim",
            CFARG_EOL);
@@ -100,7 +100,7 @@
         * attached.
         */
        sc->sc_pri = ATTACH_NORMAL;
-       config_search(self, txsim_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, txsim_search,
            CFARG_IATTR, "txsim",
            CFARG_EOL);
@@ -109,7 +109,7 @@
         * UART module uses platform dependent config_hooks.
         */
        sc->sc_pri = ATTACH_LAST;
-       config_search(self, txsim_print,
+       config_search(self, NULL,
            CFARG_SUBMATCH, txsim_search,
            CFARG_IATTR, "txsim",
            CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/vr/vrc4173bcu.c
--- a/sys/arch/hpcmips/vr/vrc4173bcu.c  Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/vr/vrc4173bcu.c  Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vrc4173bcu.c,v 1.24.28.1 2021/03/20 19:33:35 thorpej Exp $     */
+/*     $NetBSD: vrc4173bcu.c,v 1.24.28.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24.28.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -425,7 +425,7 @@
         *  sc->sc_pri = 2~1
         */
        for (sc->sc_pri = 2; 0 < sc->sc_pri; sc->sc_pri--) {
-               config_search(self, vrc4173bcu_print,
+               config_search(self, NULL,
                    CFARG_SUBMATCH, vrc4173bcu_search,
                    CFARG_IATTR, "vripif",
                    CFARG_EOL);
diff -r 74cb16c866a5 -r 509e18107118 sys/arch/hpcmips/vr/vrip.c
--- a/sys/arch/hpcmips/vr/vrip.c        Sat Mar 20 20:47:53 2021 +0000
+++ b/sys/arch/hpcmips/vr/vrip.c        Sat Mar 20 20:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vrip.c,v 1.37.52.1 2021/03/20 19:33:35 thorpej Exp $   */
+/*     $NetBSD: vrip.c,v 1.37.52.2 2021/03/20 20:49:43 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1999, 2002
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.1 2021/03/20 19:33:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrip.c,v 1.37.52.2 2021/03/20 20:49:43 thorpej Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -245,14 +245,14 @@
         *      device. so attach first
         */
        sc->sc_pri = 2;



Home | Main Index | Thread Index | Old Index