[src/trunk]: src/sys/dev/fdt use fdtbus_intr_establish_xname

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

details:   https://anonhg.NetBSD.org/src/rev/8346f78469b9
branches:  trunk
changeset: 949735:8346f78469b9
user:      ryo <ryo%NetBSD.org@localhost>
date:      Fri Jan 15 20:50:49 2021 +0000

description:
use fdtbus_intr_establish_xname

diffstat:

 sys/dev/fdt/arasan_sdhc_fdt.c |  7 ++++---
 sys/dev/fdt/dw_apb_uart.c     |  8 ++++----
 sys/dev/fdt/dwc3_fdt.c        |  8 ++++----
 sys/dev/fdt/dwcmmc_fdt.c      |  8 ++++----
 sys/dev/fdt/ehci_fdt.c        |  8 ++++----
 sys/dev/fdt/ohci_fdt.c        |  8 ++++----
 6 files changed, 24 insertions(+), 23 deletions(-)

diffs (173 lines):

diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/arasan_sdhc_fdt.c
--- a/sys/dev/fdt/arasan_sdhc_fdt.c     Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/arasan_sdhc_fdt.c     Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arasan_sdhc_fdt.c,v 1.3 2019/07/03 23:10:43 jmcneill Exp $ */
+/* $NetBSD: arasan_sdhc_fdt.c,v 1.4 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.3 2019/07/03 23:10:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.4 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -306,7 +306,8 @@
 
        fdtbus_register_clock_controller(self, phandle, &arasan_sdhc_fdt_clk_funcs);
 
-       ih = fdtbus_intr_establish(phandle, 0, IPL_SDMMC, 0, sdhc_intr, &sc->sc_base);
+       ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SDMMC, 0,
+           sdhc_intr, &sc->sc_base, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n", intrstr);
                return;
diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/dw_apb_uart.c
--- a/sys/dev/fdt/dw_apb_uart.c Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/dw_apb_uart.c Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_apb_uart.c,v 1.8 2020/10/02 14:59:56 rin Exp $ */
+/* $NetBSD: dw_apb_uart.c,v 1.9 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.8 2020/10/02 14:59:56 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.9 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -136,8 +136,8 @@
                return;
        }
 
-       ssc->ssc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
-           FDT_INTR_MPSAFE, comintr, sc);
+       ssc->ssc_ih = fdtbus_intr_establish_xname(faa->faa_phandle, 0,
+           IPL_SERIAL, FDT_INTR_MPSAFE, comintr, sc, device_xname(self));
        if (ssc->ssc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/dwc3_fdt.c
--- a/sys/dev/fdt/dwc3_fdt.c    Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/dwc3_fdt.c    Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc3_fdt.c,v 1.11 2020/10/15 09:33:44 jmcneill Exp $ */
+/* $NetBSD: dwc3_fdt.c,v 1.12 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.11 2020/10/15 09:33:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc3_fdt.c,v 1.12 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -306,8 +306,8 @@
                return;
        }
 
-       ih = fdtbus_intr_establish(dwc3_phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
-           xhci_intr, sc);
+       ih = fdtbus_intr_establish_xname(dwc3_phandle, 0, IPL_USB,
+           FDT_INTR_MPSAFE, xhci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/dwcmmc_fdt.c
--- a/sys/dev/fdt/dwcmmc_fdt.c  Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/dwcmmc_fdt.c  Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.11 2020/01/22 23:19:11 jmcneill Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.12 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.11 2020/01/22 23:19:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.12 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -182,8 +182,8 @@
        if (dwc_mmc_init(sc) != 0)
                return;
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0,
-           dwc_mmc_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0,
+           dwc_mmc_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/ehci_fdt.c
--- a/sys/dev/fdt/ehci_fdt.c    Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/ehci_fdt.c    Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_fdt.c,v 1.4 2018/08/12 16:33:58 jmcneill Exp $ */
+/* $NetBSD: ehci_fdt.c,v 1.5 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.4 2018/08/12 16:33:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_fdt.c,v 1.5 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -132,8 +132,8 @@
                return;
        }
 
-       ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
-           ehci_intr, sc);
+       ih = fdtbus_intr_establish_xname(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
+           ehci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 9b0b17fd8f58 -r 8346f78469b9 sys/dev/fdt/ohci_fdt.c
--- a/sys/dev/fdt/ohci_fdt.c    Fri Jan 15 18:42:40 2021 +0000
+++ b/sys/dev/fdt/ohci_fdt.c    Fri Jan 15 20:50:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_fdt.c,v 1.3 2018/08/12 16:33:58 jmcneill Exp $ */
+/* $NetBSD: ohci_fdt.c,v 1.4 2021/01/15 20:50:49 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.3 2018/08/12 16:33:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_fdt.c,v 1.4 2021/01/15 20:50:49 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -128,8 +128,8 @@
                return;
        }
 
-       ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
-           ohci_intr, sc);
+       ih = fdtbus_intr_establish_xname(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
+           ohci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);