[src/trunk]: src/sys/dev/sbus Don't bother with prom_node_to_devhandle() if w...

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

details:   https://anonhg.NetBSD.org/src/rev/f0a296f36beb
branches:  trunk
changeset: 359752:f0a296f36beb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jan 21 19:14:14 2022 +0000

description:
Don't bother with prom_node_to_devhandle() if we're just forwarding along
our own node; use device_handle(self) instead.

diffstat:

 sys/arch/sparc/dev/vme_machdep.c |  6 +++---
 sys/arch/sparc/sparc/msiiep.c    |  6 +++---
 sys/arch/sparc64/dev/psycho.c    |  6 +++---
 sys/arch/sparc64/dev/pyro.c      |  6 +++---
 sys/arch/sparc64/dev/schizo.c    |  6 +++---
 sys/arch/sparc64/dev/vpci.c      |  6 +++---
 sys/dev/sbus/xbox.c              |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diffs (187 lines):

diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc/dev/vme_machdep.c
--- a/sys/arch/sparc/dev/vme_machdep.c  Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc/dev/vme_machdep.c  Fri Jan 21 19:14:14 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vme_machdep.c,v 1.75 2021/12/05 04:21:31 msaitoh Exp $ */
+/*     $NetBSD: vme_machdep.c,v 1.76 2022/01/21 19:22:56 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.75 2021/12/05 04:21:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.76 2022/01/21 19:22:56 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/extent.h>
@@ -432,7 +432,7 @@
               sc->sc_reg->vmebus_cr & VMEBUS_CR_IMPL);
 
        (void)config_found(self, &vba, 0,
-           CFARGS(.devhandle = prom_node_to_devhandle(node)));
+           CFARGS(.devhandle = device_handle(self)));
 #endif /* SUN4M */
 }
 
diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc/sparc/msiiep.c
--- a/sys/arch/sparc/sparc/msiiep.c     Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc/sparc/msiiep.c     Fri Jan 21 19:14:14 2022 +0000
@@ -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_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)));
 }
 
 
diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc64/dev/psycho.c
--- a/sys/arch/sparc64/dev/psycho.c     Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc64/dev/psycho.c     Fri Jan 21 19:14:14 2022 +0000
@@ -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 @@
        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
diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc64/dev/pyro.c
--- a/sys/arch/sparc64/dev/pyro.c       Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc64/dev/pyro.c       Fri Jan 21 19:14:14 2022 +0000
@@ -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 @@
        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
diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc64/dev/schizo.c
--- a/sys/arch/sparc64/dev/schizo.c     Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc64/dev/schizo.c     Fri Jan 21 19:14:14 2022 +0000
@@ -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 @@
        }
 
        config_found(sc->sc_dev, &pba, schizo_print,
-           CFARGS(.devhandle = prom_node_to_devhandle(sc->sc_node)));
+           CFARGS(.devhandle = device_handle(self)));
 }
 
 int
diff -r 14a196ca67aa -r f0a296f36beb sys/arch/sparc64/dev/vpci.c
--- a/sys/arch/sparc64/dev/vpci.c       Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/arch/sparc64/dev/vpci.c       Fri Jan 21 19:14:14 2022 +0000
@@ -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 @@
        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
diff -r 14a196ca67aa -r f0a296f36beb sys/dev/sbus/xbox.c
--- a/sys/dev/sbus/xbox.c       Fri Jan 21 19:12:28 2022 +0000
+++ b/sys/dev/sbus/xbox.c       Fri Jan 21 19:14:14 2022 +0000
@@ -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 @@
        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)));
 }