Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm use fdtbus_intr_establish_xname



details:   https://anonhg.NetBSD.org/src/rev/fd7e5236636f
branches:  trunk
changeset: 979860:fd7e5236636f
user:      ryo <ryo%NetBSD.org@localhost>
date:      Fri Jan 15 18:42:40 2021 +0000

description:
use fdtbus_intr_establish_xname

diffstat:

 sys/arch/arm/amlogic/meson_dwmac.c |  9 +++++----
 sys/arch/arm/amlogic/meson_sdhc.c  |  8 ++++----
 sys/arch/arm/amlogic/meson_sdio.c  |  7 ++++---
 sys/arch/arm/amlogic/meson_uart.c  |  8 ++++----
 sys/arch/arm/amlogic/mesongx_mmc.c |  8 ++++----
 sys/arch/arm/fdt/a9ptmr_fdt.c      |  8 ++++----
 sys/arch/arm/fdt/a9tmr_fdt.c       |  8 ++++----
 sys/arch/arm/fdt/aaci_fdt.c        |  8 ++++----
 sys/arch/arm/fdt/gtmr_fdt.c        |  8 ++++----
 sys/arch/arm/fdt/plcom_fdt.c       |  8 ++++----
 sys/arch/arm/fdt/plkmi_fdt.c       |  7 ++++---
 sys/arch/arm/fdt/plmmc_fdt.c       |  7 ++++---
 sys/arch/arm/fdt/pmu_fdt.c         |  8 ++++----
 sys/arch/arm/fdt/smsh_fdt.c        |  7 ++++---
 sys/arch/arm/rockchip/rk_gmac.c    |  9 +++++----
 sys/arch/arm/rockchip/rk_i2s.c     |  7 ++++---
 sys/arch/arm/rockchip/rk_spi.c     |  7 ++++---
 sys/arch/arm/rockchip/rk_tsadc.c   |  8 ++++----
 18 files changed, 74 insertions(+), 66 deletions(-)

diffs (truncated from 518 to 300 lines):

diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/amlogic/meson_dwmac.c
--- a/sys/arch/arm/amlogic/meson_dwmac.c        Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/amlogic/meson_dwmac.c        Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_dwmac.c,v 1.9 2021/01/01 07:18:23 ryo Exp $ */
+/* $NetBSD: meson_dwmac.c,v 1.10 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.9 2021/01/01 07:18:23 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.10 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -229,8 +229,9 @@
        aprint_naive("\n");
        aprint_normal(": Gigabit Ethernet Controller\n");
 
-       if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
-           meson_dwmac_intr, sc) == NULL) {
+       if (fdtbus_intr_establish_xname(phandle, 0, IPL_NET,
+           DWCGMAC_FDT_INTR_MPSAFE, meson_dwmac_intr, sc,
+           device_xname(sc->sc_dev)) == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
                return;
        }
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/amlogic/meson_sdhc.c
--- a/sys/arch/arm/amlogic/meson_sdhc.c Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/amlogic/meson_sdhc.c Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_sdhc.c,v 1.1 2019/01/20 00:44:01 jmcneill Exp $ */
+/* $NetBSD: meson_sdhc.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.1 2019/01/20 00:44:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.2 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -244,8 +244,8 @@
        sc->sc_non_removable = of_hasprop(sc->sc_slot_phandle, "non-removable");
        sc->sc_broken_cd = of_hasprop(sc->sc_slot_phandle, "broken-cd");
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0,
-           meson_sdhc_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0,
+           meson_sdhc_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/amlogic/meson_sdio.c
--- a/sys/arch/arm/amlogic/meson_sdio.c Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/amlogic/meson_sdio.c Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_sdio.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ */
+/* $NetBSD: meson_sdio.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.2 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -224,7 +224,8 @@
        sc->sc_non_removable = of_hasprop(sc->sc_slot_phandle, "non-removable");
        sc->sc_broken_cd = of_hasprop(sc->sc_slot_phandle, "broken-cd");
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, meson_sdio_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0,
+           meson_sdio_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/amlogic/meson_uart.c
--- a/sys/arch/arm/amlogic/meson_uart.c Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/amlogic/meson_uart.c Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_uart.c,v 1.3 2019/05/28 05:08:47 ryo Exp $ */
+/* $NetBSD: meson_uart.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: meson_uart.c,v 1.3 2019/05/28 05:08:47 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: meson_uart.c,v 1.4 2021/01/15 18:42:40 ryo Exp $");
 
 #define cn_trap()                      \
        do {                            \
@@ -187,8 +187,8 @@
        }
 
        mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SERIAL);
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL,
-           FDT_INTR_MPSAFE, meson_uart_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL,
+           FDT_INTR_MPSAFE, meson_uart_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error(": failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/amlogic/mesongx_mmc.c
--- a/sys/arch/arm/amlogic/mesongx_mmc.c        Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/amlogic/mesongx_mmc.c        Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.9 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.9 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -375,8 +375,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, FDT_INTR_MPSAFE,
-           mesongx_mmc_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO,
+           FDT_INTR_MPSAFE, mesongx_mmc_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/a9ptmr_fdt.c
--- a/sys/arch/arm/fdt/a9ptmr_fdt.c     Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/a9ptmr_fdt.c     Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a9ptmr_fdt.c,v 1.1 2019/08/10 17:03:59 skrll Exp $ */
+/* $NetBSD: a9ptmr_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9ptmr_fdt.c,v 1.1 2019/08/10 17:03:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9ptmr_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -102,8 +102,8 @@
        aprint_naive("\n");
        aprint_normal("\n");
 
-       void *ih = fdtbus_intr_establish(phandle, 0, IPL_CLOCK,
-           FDT_INTR_MPSAFE, a9ptmr_intr, NULL);
+       void *ih = fdtbus_intr_establish_xname(phandle, 0, IPL_CLOCK,
+           FDT_INTR_MPSAFE, a9ptmr_intr, NULL, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
                return;
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/a9tmr_fdt.c
--- a/sys/arch/arm/fdt/a9tmr_fdt.c      Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/a9tmr_fdt.c      Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a9tmr_fdt.c,v 1.3 2019/01/22 15:17:33 jmcneill Exp $ */
+/* $NetBSD: a9tmr_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr_fdt.c,v 1.3 2019/01/22 15:17:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -103,8 +103,8 @@
        aprint_naive("\n");
        aprint_normal("\n");
 
-       void *ih = fdtbus_intr_establish(phandle, 0, IPL_CLOCK,
-           FDT_INTR_MPSAFE, a9tmr_intr, NULL);
+       void *ih = fdtbus_intr_establish_xname(phandle, 0, IPL_CLOCK,
+           FDT_INTR_MPSAFE, a9tmr_intr, NULL, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
                return;
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/aaci_fdt.c
--- a/sys/arch/arm/fdt/aaci_fdt.c       Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/aaci_fdt.c       Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aaci_fdt.c,v 1.1 2017/06/08 10:03:59 jmcneill Exp $ */
+/* $NetBSD: aaci_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aaci_fdt.c,v 1.1 2017/06/08 10:03:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aaci_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -93,8 +93,8 @@
                return;
        }
 
-       ih = fdtbus_intr_establish(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE,
-           aaci_intr, sc);
+       ih = fdtbus_intr_establish_xname(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE,
+           aaci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
                return;
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/gtmr_fdt.c
--- a/sys/arch/arm/fdt/gtmr_fdt.c       Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/gtmr_fdt.c       Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $ */
+/* $NetBSD: gtmr_fdt.c,v 1.8 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.8 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -86,8 +86,8 @@
                return;
        }
 
-       void *ih = fdtbus_intr_establish(phandle, GTMR_VTIMER, IPL_CLOCK,
-           FDT_INTR_MPSAFE, gtmr_intr, NULL);
+       void *ih = fdtbus_intr_establish_xname(phandle, GTMR_VTIMER, IPL_CLOCK,
+           FDT_INTR_MPSAFE, gtmr_intr, NULL, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
                return;
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/plcom_fdt.c
--- a/sys/arch/arm/fdt/plcom_fdt.c      Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/plcom_fdt.c      Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $ */
+/* $NetBSD: plcom_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -110,8 +110,8 @@
 
        aprint_normal_dev(self, "interrupting on %s\n", intrstr);
 
-       ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE,
-           plcomintr, sc);
+       ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE,
+           plcomintr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
                return;
diff -r 6cd0e529c591 -r fd7e5236636f sys/arch/arm/fdt/plkmi_fdt.c
--- a/sys/arch/arm/fdt/plkmi_fdt.c      Fri Jan 15 17:17:04 2021 +0000
+++ b/sys/arch/arm/fdt/plkmi_fdt.c      Fri Jan 15 18:42:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plkmi_fdt.c,v 1.1 2017/06/03 17:05:23 jmcneill Exp $ */
+/* $NetBSD: plkmi_fdt.c,v 1.2 2021/01/15 18:42:41 ryo Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@



Home | Main Index | Thread Index | Old Index