Module Name: src
Committed By: thorpej
Date: Sat Mar 20 20:49:43 UTC 2021
Modified Files:
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/mips/rmi [thorpej-cfargs]: rmixl_mainbus.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/hpcmips/dev/plum.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/arch/hpcmips/dev/plumiobus.c
cvs rdiff -u -r1.19.52.1 -r1.19.52.2 src/sys/arch/hpcmips/dev/ucb1200.c
cvs rdiff -u -r1.21.52.1 -r1.21.52.2 src/sys/arch/hpcmips/tx/tx39sib.c
cvs rdiff -u -r1.5.52.1 -r1.5.52.2 src/sys/arch/hpcmips/tx/tx39spi.c
cvs rdiff -u -r1.15.52.1 -r1.15.52.2 src/sys/arch/hpcmips/tx/tx39uart.c
cvs rdiff -u -r1.22.52.1 -r1.22.52.2 src/sys/arch/hpcmips/tx/txcsbus.c
cvs rdiff -u -r1.17.52.1 -r1.17.52.2 src/sys/arch/hpcmips/tx/txsim.c
cvs rdiff -u -r1.24.28.1 -r1.24.28.2 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.37.52.1 -r1.37.52.2 src/sys/arch/hpcmips/vr/vrip.c
cvs rdiff -u -r1.4.68.1 -r1.4.68.2 src/sys/arch/mips/rmi/rmixl_mainbus.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/hpcmips/dev/plum.c
diff -u src/sys/arch/hpcmips/dev/plum.c:1.18.2.1 src/sys/arch/hpcmips/dev/plum.c:1.18.2.2
--- src/sys/arch/hpcmips/dev/plum.c:1.18.2.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/dev/plum.c Sat Mar 20 20:49:43 2021
@@ -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 @@ plum_attach(device_t parent, device_t se
* 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 @@ plum_attach(device_t parent, device_t se
* 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);
Index: src/sys/arch/hpcmips/dev/plumiobus.c
diff -u src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.1 src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.2
--- src/sys/arch/hpcmips/dev/plumiobus.c:1.16.2.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/dev/plumiobus.c Sat Mar 20 20:49:43 2021
@@ -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_attach(device_t parent, device
plumiobus_dump(sc);
#endif
- config_search(self, plumiobus_print,
+ 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.1 src/sys/arch/hpcmips/dev/ucb1200.c:1.19.52.2
--- src/sys/arch/hpcmips/dev/ucb1200.c:1.19.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/dev/ucb1200.c Sat Mar 20 20:49:43 2021
@@ -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 @@ ucb1200_attach(device_t parent, device_t
(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);
Index: src/sys/arch/hpcmips/tx/tx39sib.c
diff -u src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.1 src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.2
--- src/sys/arch/hpcmips/tx/tx39sib.c:1.21.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/tx/tx39sib.c Sat Mar 20 20:49:43 2021
@@ -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_attach(device_t parent, device_t
tx39sib_dump(sc);
#endif
- config_search(self, tx39sib_print,
+ 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.1 src/sys/arch/hpcmips/tx/tx39spi.c:1.5.52.2
--- src/sys/arch/hpcmips/tx/tx39spi.c:1.5.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/tx/tx39spi.c Sat Mar 20 20:49:43 2021
@@ -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 @@ tx39spi_attach(device_t parent, device_t
#endif
printf("\n");
- config_search(self, tx39spi_print,
+ 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.1 src/sys/arch/hpcmips/tx/tx39uart.c:1.15.52.2
--- src/sys/arch/hpcmips/tx/tx39uart.c:1.15.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/tx/tx39uart.c Sat Mar 20 20:49:43 2021
@@ -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 @@ tx39uart_attach(device_t parent, device_
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);
Index: src/sys/arch/hpcmips/tx/txcsbus.c
diff -u src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.1 src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.2
--- src/sys/arch/hpcmips/tx/txcsbus.c:1.22.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/tx/txcsbus.c Sat Mar 20 20:49:43 2021
@@ -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 @@ txcsbus_attach(device_t parent, device_t
*/
/* 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);
Index: src/sys/arch/hpcmips/tx/txsim.c
diff -u src/sys/arch/hpcmips/tx/txsim.c:1.17.52.1 src/sys/arch/hpcmips/tx/txsim.c:1.17.52.2
--- src/sys/arch/hpcmips/tx/txsim.c:1.17.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/tx/txsim.c Sat Mar 20 20:49:43 2021
@@ -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 @@ txsim_attach(device_t parent, device_t s
* 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 @@ txsim_attach(device_t parent, device_t s
* 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 @@ txsim_attach(device_t parent, device_t s
* 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);
Index: src/sys/arch/hpcmips/vr/vrc4173bcu.c
diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.1 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.2
--- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24.28.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/vr/vrc4173bcu.c Sat Mar 20 20:49:43 2021
@@ -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 @@ vrc4173bcu_attach(device_t parent, devic
* 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);
Index: src/sys/arch/hpcmips/vr/vrip.c
diff -u src/sys/arch/hpcmips/vr/vrip.c:1.37.52.1 src/sys/arch/hpcmips/vr/vrip.c:1.37.52.2
--- src/sys/arch/hpcmips/vr/vrip.c:1.37.52.1 Sat Mar 20 19:33:35 2021
+++ src/sys/arch/hpcmips/vr/vrip.c Sat Mar 20 20:49:43 2021
@@ -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 @@ vripattach_common(device_t parent, devic
* device. so attach first
*/
sc->sc_pri = 2;
- config_search(self, vrip_print,
+ config_search(self, NULL,
CFARG_SUBMATCH, vrip_search,
CFARG_IATTR, "vripif",
CFARG_EOL);
/* Other system devices. */
sc->sc_pri = 1;
- config_search(self, vrip_print,
+ config_search(self, NULL,
CFARG_SUBMATCH, vrip_search,
CFARG_IATTR, "vripif",
CFARG_EOL);
Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.1 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.2
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.4.68.1 Sat Mar 20 19:33:36 2021
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c Sat Mar 20 20:49:43 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_mainbus.c,v 1.4.68.1 2021/03/20 19:33:36 thorpej Exp $ */
+/* $NetBSD: rmixl_mainbus.c,v 1.4.68.2 2021/03/20 20:49:43 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.1 2021/03/20 19:33:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.4.68.2 2021/03/20 20:49:43 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ mainbusattach(device_t parent, device_t
/*
* attach mainbus devices
*/
- config_search(self, mainbus_print,
+ config_search(self, NULL,
CFARG_SUBMATCH, mainbus_search,
CFARG_IATTR, "mainbus",
CFARG_EOL);
