[src/trunk]: src/sys/arch Don't bother with devhandle_from_of() if we're just...

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

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

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

diffstat:

 sys/arch/macppc/pci/bandit.c   |  6 +++---
 sys/arch/macppc/pci/grackle.c  |  6 +++---
 sys/arch/macppc/pci/u3.c       |  4 ++--
 sys/arch/macppc/pci/uninorth.c |  6 +++---
 sys/arch/shark/ofw/ofisascr.c  |  6 +++---
 sys/arch/shark/ofw/vlpci.c     |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diffs (151 lines):

diff -r c8d45534f941 -r 14a196ca67aa sys/arch/macppc/pci/bandit.c
--- a/sys/arch/macppc/pci/bandit.c      Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/macppc/pci/bandit.c      Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bandit.c,v 1.34 2021/08/07 16:18:58 thorpej Exp $      */
+/*     $NetBSD: bandit.c,v 1.35 2022/01/21 19:12:28 thorpej Exp $      */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.34 2021/08/07 16:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bandit.c,v 1.35 2022/01/21 19:12:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -153,7 +153,7 @@
        pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 
        config_found(self, &pba, pcibusprint,
-           CFARGS(.devhandle = devhandle_from_of(node)));
+           CFARGS(.devhandle = device_handle(self)));
 }
 
 static pcireg_t
diff -r c8d45534f941 -r 14a196ca67aa sys/arch/macppc/pci/grackle.c
--- a/sys/arch/macppc/pci/grackle.c     Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/macppc/pci/grackle.c     Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grackle.c,v 1.18 2021/08/07 16:18:58 thorpej Exp $     */
+/*     $NetBSD: grackle.c,v 1.19 2022/01/21 19:12:28 thorpej Exp $     */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.18 2021/08/07 16:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grackle.c,v 1.19 2022/01/21 19:12:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -146,7 +146,7 @@
        pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 
        config_found(self, &pba, pcibusprint,
-           CFARGS(.devhandle = devhandle_from_of(node)));
+           CFARGS(.devhandle = device_handle(self)));
 }
 
 static pcireg_t
diff -r c8d45534f941 -r 14a196ca67aa sys/arch/macppc/pci/u3.c
--- a/sys/arch/macppc/pci/u3.c  Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/macppc/pci/u3.c  Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: u3.c,v 1.11 2021/08/07 16:18:58 thorpej Exp $ */
+/* $NetBSD: u3.c,v 1.12 2022/01/21 19:12:28 thorpej Exp $ */
 
 /*
  * Copyright 2006 Kyma Systems LLC.
@@ -166,7 +166,7 @@
                pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
 
                config_found(self, &pba, pcibusprint,
-                   CFARGS(.devhandle = devhandle_from_of(child)));
+                   CFARGS(.devhandle = device_handle(self)));
 
                pc++;
        }
diff -r c8d45534f941 -r 14a196ca67aa sys/arch/macppc/pci/uninorth.c
--- a/sys/arch/macppc/pci/uninorth.c    Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/macppc/pci/uninorth.c    Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uninorth.c,v 1.22 2021/08/07 16:18:58 thorpej Exp $    */
+/*     $NetBSD: uninorth.c,v 1.23 2022/01/21 19:12:28 thorpej Exp $    */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.22 2021/08/07 16:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uninorth.c,v 1.23 2022/01/21 19:12:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -184,7 +184,7 @@
        pba.pba_flags = PCI_FLAGS_IO_OKAY | PCI_FLAGS_MEM_OKAY;
 
        config_found(self, &pba, pcibusprint,
-           CFARGS(.devhandle = devhandle_from_of(node)));
+           CFARGS(.devhandle = device_handle(self)));
 }
 
 static pcireg_t
diff -r c8d45534f941 -r 14a196ca67aa sys/arch/shark/ofw/ofisascr.c
--- a/sys/arch/shark/ofw/ofisascr.c     Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/shark/ofw/ofisascr.c     Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofisascr.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $    */
+/*     $NetBSD: ofisascr.c,v 1.13 2022/01/21 19:12:28 thorpej Exp $    */
 
 /*
  * Copyright 1997
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.13 2022/01/21 19:12:28 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -105,5 +105,5 @@
        ia.ia_aux = (void *)oba->oba_phandle;
     
        config_found(dev, &ia, NULL,
-           CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle)));
+           CFARGS(.devhandle = device_handle(dev)));
 }
diff -r c8d45534f941 -r 14a196ca67aa sys/arch/shark/ofw/vlpci.c
--- a/sys/arch/shark/ofw/vlpci.c        Fri Jan 21 15:55:36 2022 +0000
+++ b/sys/arch/shark/ofw/vlpci.c        Fri Jan 21 19:12:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vlpci.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $       */
+/*     $NetBSD: vlpci.c,v 1.13 2022/01/21 19:12:28 thorpej Exp $       */
 
 /*
  * Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.12 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.13 2022/01/21 19:12:28 thorpej Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -329,7 +329,7 @@
        vlpci_dump_window(sc, VLPCI_PCI_WND_NO_3);
 
        config_found(self, &pba, pcibusprint,
-           CFARGS(.devhandle = devhandle_from_of(oba->oba_phandle)));
+           CFARGS(.devhandle = device_handle(self)));
 }
 
 static void