Module Name: src
Committed By: rin
Date: Sun Aug 19 09:18:48 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_emmc.c bcm2835_mbox.c
Log Message:
Clean up leftover when converting intr_establish() to fdtbus_intr_establish().
The latter accept only flags 0 or FDT_INTR_MPSAFE. For both cases, it add
IST_LEVEL flag for underlying intr_establish() function.
OK skrll
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/broadcom/bcm2835_mbox.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/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.32 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.33
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.32 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Sun Aug 19 09:18:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.32 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.33 2018/08/19 09:18:48 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.32 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.33 2018/08/19 09:18:48 rin Exp $");
#include "bcmdmac.h"
@@ -174,7 +174,7 @@ bcmemmc_attach(device_t parent, device_t
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SDMMC, IST_LEVEL,
+ sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SDMMC, 0,
sdhc_intr, &sc->sc);
if (sc->sc_ih == NULL) {
Index: src/sys/arch/arm/broadcom/bcm2835_mbox.c
diff -u src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.12 src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.13
--- src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.12 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/arm/broadcom/bcm2835_mbox.c Sun Aug 19 09:18:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox.c,v 1.12 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: bcm2835_mbox.c,v 1.13 2018/08/19 09:18:48 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.12 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.13 2018/08/19 09:18:48 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ bcmmbox_attach(device_t parent, device_t
return;
}
- sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, IST_LEVEL,
+ sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, 0,
bcmmbox_intr, sc);
if (sc->sc_intrh == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
