Module Name: src
Committed By: skrll
Date: Fri Jan 29 14:12:01 UTC 2021
Modified Files:
src/sys/arch/arm/altera: cycv_dwcmmc.c cycv_gmac.c
Log Message:
fdtbus_intr_establish -> fdtbus_intr_establish_xname
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/altera/cycv_dwcmmc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/altera/cycv_gmac.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/arch/arm/altera/cycv_dwcmmc.c
diff -u src/sys/arch/arm/altera/cycv_dwcmmc.c:1.6 src/sys/arch/arm/altera/cycv_dwcmmc.c:1.7
--- src/sys/arch/arm/altera/cycv_dwcmmc.c:1.6 Wed Jan 27 03:10:18 2021
+++ src/sys/arch/arm/altera/cycv_dwcmmc.c Fri Jan 29 14:12:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_dwcmmc.c,v 1.6 2021/01/27 03:10:18 thorpej Exp $ */
+/* $NetBSD: cycv_dwcmmc.c,v 1.7 2021/01/29 14:12:01 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.6 2021/01/27 03:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_dwcmmc.c,v 1.7 2021/01/29 14:12:01 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -157,8 +157,8 @@ cycv_dwcmmc_attach(device_t parent, devi
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(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/altera/cycv_gmac.c
diff -u src/sys/arch/arm/altera/cycv_gmac.c:1.5 src/sys/arch/arm/altera/cycv_gmac.c:1.6
--- src/sys/arch/arm/altera/cycv_gmac.c:1.5 Wed Jan 27 03:10:18 2021
+++ src/sys/arch/arm/altera/cycv_gmac.c Fri Jan 29 14:12:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_gmac.c,v 1.5 2021/01/27 03:10:18 thorpej Exp $ */
+/* $NetBSD: cycv_gmac.c,v 1.6 2021/01/29 14:12:01 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.5 2021/01/27 03:10:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_gmac.c,v 1.6 2021/01/29 14:12:01 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -132,8 +132,8 @@ cycv_gmac_attach(device_t parent, device
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
- cycv_gmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish_xname(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
+ cycv_gmac_intr, sc, device_xname(sc->sc_dev)) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
return;
