[src/trunk]: src/sys/arch/arm/samsung Use fdtbus_intr_establish_xname

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

details:   https://anonhg.NetBSD.org/src/rev/9dc15b24fd7a
branches:  trunk
changeset: 953610:9dc15b24fd7a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 14 08:16:57 2021 +0000

description:
Use fdtbus_intr_establish_xname

diffstat:

 sys/arch/arm/samsung/exynos_combiner.c |  15 ++++++++-------
 sys/arch/arm/samsung/exynos_dwcmmc.c   |   8 ++++----
 sys/arch/arm/samsung/exynos_ehci.c     |   8 ++++----
 sys/arch/arm/samsung/exynos_i2c.c      |   8 ++++----
 sys/arch/arm/samsung/exynos_ohci.c     |   8 ++++----
 sys/arch/arm/samsung/exynos_uart.c     |   8 ++++----
 sys/arch/arm/samsung/mct.c             |   8 ++++----
 7 files changed, 32 insertions(+), 31 deletions(-)

diffs (211 lines):

diff -r c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_combiner.c
--- a/sys/arch/arm/samsung/exynos_combiner.c    Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_combiner.c    Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_combiner.c,v 1.13 2021/01/27 03:10:19 thorpej Exp $ */
+/*     $NetBSD: exynos_combiner.c,v 1.14 2021/03/14 08:16:57 skrll Exp $ */
 
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include "gpio.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.13 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.14 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -254,12 +254,13 @@
        if (!groupp) {
                groupp = exynos_combiner_new_group(sc, group);
                if (arg == NULL) {
-                       groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
-                           group, ipl /* XXX */, flags, func, NULL);
+                       groupp->irq_ih = fdtbus_intr_establish_xname(
+                           sc->sc_phandle, group, ipl /* XXX */, flags, func, NULL,
+                           device_xname(dev));
                } else {
-                       groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
-                           group, ipl /* XXX */, FDT_INTR_MPSAFE,
-                           exynos_combiner_irq, groupp);
+                       groupp->irq_ih = fdtbus_intr_establish_xname(
+                           sc->sc_phandle,  group, ipl /* XXX */, FDT_INTR_MPSAFE,
+                           exynos_combiner_irq, groupp, device_xname(dev));
                }
                KASSERT(groupp->irq_ih != NULL);
                groupp->irq_ipl = ipl;
diff -r c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_dwcmmc.c
--- a/sys/arch/arm/samsung/exynos_dwcmmc.c      Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_dwcmmc.c      Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_dwcmmc.c,v 1.14 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_dwcmmc.c,v 1.15 2021/03/14 08:16:57 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.14 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.15 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -165,8 +165,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 c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_ehci.c
--- a/sys/arch/arm/samsung/exynos_ehci.c        Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_ehci.c        Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ehci.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_ehci.c,v 1.6 2021/03/14 08:16:57 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_ehci.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_ehci.c,v 1.6 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -126,8 +126,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 c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_i2c.c
--- a/sys/arch/arm/samsung/exynos_i2c.c Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_i2c.c Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_i2c.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $ */
+/*     $NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $ */
 
 /*
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
 #include "opt_arm_debug.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -159,8 +159,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, exynos_i2c_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+           FDT_INTR_MPSAFE, exynos_i2c_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_ohci.c
--- a/sys/arch/arm/samsung/exynos_ohci.c        Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_ohci.c        Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ohci.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_ohci.c,v 1.5 2021/03/14 08:16:57 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_ohci.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_ohci.c,v 1.5 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -122,8 +122,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);
diff -r c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/exynos_uart.c
--- a/sys/arch/arm/samsung/exynos_uart.c        Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/exynos_uart.c        Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_uart.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_uart.c,v 1.5 2021/03/14 08:16:57 skrll Exp $ */
 
 /*-
  * Copyright (c) 2013-2018 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.5 2021/03/14 08:16:57 skrll Exp $");
 
 #define cn_trap()                      \
        do {                            \
@@ -199,8 +199,8 @@
        }
        sc->sc_freq = clk_get_rate(clk_uart_baud0);
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL,
-           0, exynos_uart_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL,
+           0, exynos_uart_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error(": failed to establish interrupt on %s\n",
                    intrstr);
diff -r c362f1fafca1 -r 9dc15b24fd7a sys/arch/arm/samsung/mct.c
--- a/sys/arch/arm/samsung/mct.c        Sun Mar 14 08:13:58 2021 +0000
+++ b/sys/arch/arm/samsung/mct.c        Sun Mar 14 08:16:57 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mct.c,v 1.17 2021/01/27 03:10:19 thorpej Exp $ */
+/*     $NetBSD: mct.c,v 1.18 2021/03/14 08:16:57 skrll Exp $   */
 
 /*-
  * Copyright (c) 2014-2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.17 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.18 2021/03/14 08:16:57 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -193,8 +193,8 @@
        if (!fdtbus_intr_str(sc->sc_phandle, 0, intrstr, sizeof(intrstr)))
                panic("%s: failed to decode interrupt", __func__);
 
-       sc->sc_global_ih = fdtbus_intr_establish(sc->sc_phandle, 0, IPL_CLOCK,
-           FDT_INTR_MPSAFE, mct_intr, NULL);
+       sc->sc_global_ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, IPL_CLOCK,
+           FDT_INTR_MPSAFE, mct_intr, NULL, device_xname(sc->sc_dev));
        if (sc->sc_global_ih == NULL)
                panic("%s: failed to establish timer interrupt on %s", __func__, intrstr);