Module Name: src
Committed By: thorpej
Date: Fri Jan 21 19:14:14 UTC 2022
Modified Files:
src/sys/arch/sparc/sparc: msiiep.c
src/sys/arch/sparc64/dev: psycho.c pyro.c schizo.c vpci.c
src/sys/dev/sbus: xbox.c
Log Message:
Don't bother with prom_node_to_devhandle() if we're just forwarding along
our own node; use device_handle(self) instead.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sparc/sparc/msiiep.c
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/dev/pyro.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/dev/schizo.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/dev/vpci.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sbus/xbox.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/sparc/sparc/msiiep.c
diff -u src/sys/arch/sparc/sparc/msiiep.c:1.52 src/sys/arch/sparc/sparc/msiiep.c:1.53
--- src/sys/arch/sparc/sparc/msiiep.c:1.52 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc/sparc/msiiep.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msiiep.c,v 1.52 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: msiiep.c,v 1.53 2022/01/21 19:14:14 thorpej Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.52 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.53 2022/01/21 19:14:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -363,7 +363,7 @@ mspcic_attach(device_t parent, device_t
mspcic_pci_scan(sc->sc_node);
config_found(self, &pba, mspcic_print,
- CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+ CFARGS(.devhandle = device_handle(self)));
}
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.135 src/sys/arch/sparc64/dev/psycho.c:1.136
--- src/sys/arch/sparc64/dev/psycho.c:1.135 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/psycho.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.135 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: psycho.c,v 1.136 2022/01/21 19:14:14 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.135 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.136 2022/01/21 19:14:14 thorpej Exp $");
#include "opt_ddb.h"
@@ -685,7 +685,7 @@ found:
pba.pba_pc = pp->pp_pc;
config_found(self, &pba, psycho_print,
- CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+ CFARGS(.devhandle = device_handle(self)));
}
static int
Index: src/sys/arch/sparc64/dev/pyro.c
diff -u src/sys/arch/sparc64/dev/pyro.c:1.25 src/sys/arch/sparc64/dev/pyro.c:1.26
--- src/sys/arch/sparc64/dev/pyro.c:1.25 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/pyro.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pyro.c,v 1.25 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: pyro.c,v 1.26 2022/01/21 19:14:14 thorpej Exp $ */
/* from: $OpenBSD: pyro.c,v 1.20 2010/12/05 15:15:14 kettenis Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.25 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pyro.c,v 1.26 2022/01/21 19:14:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -238,7 +238,7 @@ pyro_init(struct pyro_softc *sc, int bus
free(busranges, M_DEVBUF);
config_found(sc->sc_dev, &pba, pyro_print,
- CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+ CFARGS(.devhandle = device_handle(sc->sc_dev)));
}
void
Index: src/sys/arch/sparc64/dev/schizo.c
diff -u src/sys/arch/sparc64/dev/schizo.c:1.46 src/sys/arch/sparc64/dev/schizo.c:1.47
--- src/sys/arch/sparc64/dev/schizo.c:1.46 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/schizo.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: schizo.c,v 1.46 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: schizo.c,v 1.47 2022/01/21 19:14:14 thorpej Exp $ */
/* $OpenBSD: schizo.c,v 1.55 2008/08/18 20:29:37 brad Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.46 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schizo.c,v 1.47 2022/01/21 19:14:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -366,7 +366,7 @@ schizo_attach(device_t parent, device_t
}
config_found(sc->sc_dev, &pba, schizo_print,
- CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+ CFARGS(.devhandle = device_handle(self)));
}
int
Index: src/sys/arch/sparc64/dev/vpci.c
diff -u src/sys/arch/sparc64/dev/vpci.c:1.12 src/sys/arch/sparc64/dev/vpci.c:1.13
--- src/sys/arch/sparc64/dev/vpci.c:1.12 Sat Aug 7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/vpci.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vpci.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $ */
+/* $NetBSD: vpci.c,v 1.13 2022/01/21 19:14:14 thorpej Exp $ */
/*
* Copyright (c) 2015 Palle Lyckegaard
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vpci.c,v 1.13 2022/01/21 19:14:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -268,7 +268,7 @@ FIXME
free(busranges, M_DEVBUF);
config_found(sc->sc_dev, &pba, vpci_print,
- CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+ CFARGS(.devhandle = device_handle(sc->sc_dev)));
}
void
Index: src/sys/dev/sbus/xbox.c
diff -u src/sys/dev/sbus/xbox.c:1.24 src/sys/dev/sbus/xbox.c:1.25
--- src/sys/dev/sbus/xbox.c:1.24 Sat Aug 7 16:19:15 2021
+++ src/sys/dev/sbus/xbox.c Fri Jan 21 19:14:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.24 2021/08/07 16:19:15 thorpej Exp $ */
+/* $NetBSD: xbox.c,v 1.25 2022/01/21 19:14:14 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.24 2021/08/07 16:19:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.25 2022/01/21 19:14:14 thorpej Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -150,5 +150,5 @@ xbox_attach(device_t parent, device_t se
xa.xa_dmatag = sa->sa_dmatag;
(void) config_found(self, (void *)&xa, xbox_print,
- CFARGS(.devhandle = prom_node_to_devhandle(node)));
+ CFARGS(.devhandle = device_handle(self)));
}
