Module Name: src
Committed By: skrll
Date: Sun Oct 15 09:33:25 UTC 2017
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c
Log Message:
Simplify array initialisation
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/broadcom/bcm2835_intr.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_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.12 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.13
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.12 Sun Jul 30 16:54:36 2017
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Sun Oct 15 09:33:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.12 2017/07/30 16:54:36 jmcneill Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.13 2017/10/15 09:33:25 skrll Exp $ */
/*-
* Copyright (c) 2012, 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.12 2017/07/30 16:54:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.13 2017/10/15 09:33:25 skrll Exp $");
#define _INTR_PRIVATE
@@ -105,26 +105,11 @@ static struct pic_ops bcm2836mp_picops =
};
struct pic_softc bcm2836mp_pic[BCM2836_NCPUS] = {
- [0] = {
+ [0 ... BCM2836_NCPUS - 1] = {
.pic_ops = &bcm2836mp_picops,
.pic_maxsources = BCM2836_NIRQPERCPU,
.pic_name = "bcm2836 pic",
- },
- [1] = {
- .pic_ops = &bcm2836mp_picops,
- .pic_maxsources = BCM2836_NIRQPERCPU,
- .pic_name = "bcm2836 pic",
- },
- [2] = {
- .pic_ops = &bcm2836mp_picops,
- .pic_maxsources = BCM2836_NIRQPERCPU,
- .pic_name = "bcm2836 pic",
- },
- [3] = {
- .pic_ops = &bcm2836mp_picops,
- .pic_maxsources = BCM2836_NIRQPERCPU,
- .pic_name = "bcm2836 pic",
- },
+ }
};
#endif
@@ -293,7 +278,6 @@ bcm2835_pic_find_pending_irqs(struct pic
if (armirq) {
ipl |= pic_mark_pending_sources(pic,
BCM2835_INT_BASICBASE - BCM2835_INT_BASE, armirq);
-
}
if (gpu0irq || (bpending & BCM2835_INTBIT_PENDING1)) {
