Module Name: src
Committed By: ryo
Date: Fri Jan 15 20:50:49 UTC 2021
Modified Files:
src/sys/dev/fdt: arasan_sdhc_fdt.c dw_apb_uart.c dwc3_fdt.c
dwcmmc_fdt.c ehci_fdt.c ohci_fdt.c
Log Message:
use fdtbus_intr_establish_xname
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/arasan_sdhc_fdt.c \
src/sys/dev/fdt/ohci_fdt.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/fdt/dw_apb_uart.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/dwc3_fdt.c \
src/sys/dev/fdt/dwcmmc_fdt.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/fdt/ehci_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/arasan_sdhc_fdt.c
diff -u src/sys/dev/fdt/arasan_sdhc_fdt.c:1.3 src/sys/dev/fdt/arasan_sdhc_fdt.c:1.4
--- src/sys/dev/fdt/arasan_sdhc_fdt.c:1.3 Wed Jul 3 23:10:43 2019
+++ src/sys/dev/fdt/arasan_sdhc_fdt.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ arasan_sdhc_attach(device_t parent, devi
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;
Index: src/sys/dev/fdt/ohci_fdt.c
diff -u src/sys/dev/fdt/ohci_fdt.c:1.3 src/sys/dev/fdt/ohci_fdt.c:1.4
--- src/sys/dev/fdt/ohci_fdt.c:1.3 Sun Aug 12 16:33:58 2018
+++ src/sys/dev/fdt/ohci_fdt.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ ohci_fdt_attach(device_t parent, device_
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);
Index: src/sys/dev/fdt/dw_apb_uart.c
diff -u src/sys/dev/fdt/dw_apb_uart.c:1.8 src/sys/dev/fdt/dw_apb_uart.c:1.9
--- src/sys/dev/fdt/dw_apb_uart.c:1.8 Fri Oct 2 14:59:56 2020
+++ src/sys/dev/fdt/dw_apb_uart.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ dw_apb_uart_attach(device_t parent, devi
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);
Index: src/sys/dev/fdt/dwc3_fdt.c
diff -u src/sys/dev/fdt/dwc3_fdt.c:1.11 src/sys/dev/fdt/dwc3_fdt.c:1.12
--- src/sys/dev/fdt/dwc3_fdt.c:1.11 Thu Oct 15 09:33:44 2020
+++ src/sys/dev/fdt/dwc3_fdt.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ dwc3_fdt_attach(device_t parent, device_
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);
Index: src/sys/dev/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.11 src/sys/dev/fdt/dwcmmc_fdt.c:1.12
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.11 Wed Jan 22 23:19:11 2020
+++ src/sys/dev/fdt/dwcmmc_fdt.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ dwcmmc_fdt_attach(device_t parent, devic
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);
Index: src/sys/dev/fdt/ehci_fdt.c
diff -u src/sys/dev/fdt/ehci_fdt.c:1.4 src/sys/dev/fdt/ehci_fdt.c:1.5
--- src/sys/dev/fdt/ehci_fdt.c:1.4 Sun Aug 12 16:33:58 2018
+++ src/sys/dev/fdt/ehci_fdt.c Fri Jan 15 20:50:49 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ ehci_fdt_attach(device_t parent, device_
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);
