Module Name: src
Committed By: jakllsch
Date: Sat Aug 13 15:38:47 UTC 2011
Modified Files:
src/sys/arch/arm/marvell: mvsoc_intr.c mvsocgpp.c
Log Message:
In *find_pending_irqs() return the value of pic_mark_pending_sources() instead
of 1. Changed to match other ARM PIC code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/mvsoc_intr.c \
src/sys/arch/arm/marvell/mvsocgpp.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/marvell/mvsoc_intr.c
diff -u src/sys/arch/arm/marvell/mvsoc_intr.c:1.2 src/sys/arch/arm/marvell/mvsoc_intr.c:1.3
--- src/sys/arch/arm/marvell/mvsoc_intr.c:1.2 Mon Dec 20 00:25:28 2010
+++ src/sys/arch/arm/marvell/mvsoc_intr.c Sat Aug 13 15:38:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc_intr.c,v 1.2 2010/12/20 00:25:28 matt Exp $ */
+/* $NetBSD: mvsoc_intr.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.2 2010/12/20 00:25:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc_intr.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $");
#define _INTR_PRIVATE
@@ -129,10 +129,11 @@
pending =
read_mlmbreg(MVSOC_MLMB_MLMBICR) & read_mlmbreg(MVSOC_MLMB_MLMBIMR);
+
if (pending == 0)
return 0;
- pic_mark_pending_sources(pic, 0, pending);
- return 1;
+
+ return pic_mark_pending_sources(pic, 0, pending);
}
/* ARGSUSED */
Index: src/sys/arch/arm/marvell/mvsocgpp.c
diff -u src/sys/arch/arm/marvell/mvsocgpp.c:1.2 src/sys/arch/arm/marvell/mvsocgpp.c:1.3
--- src/sys/arch/arm/marvell/mvsocgpp.c:1.2 Mon Jan 24 21:07:28 2011
+++ src/sys/arch/arm/marvell/mvsocgpp.c Sat Aug 13 15:38:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsocgpp.c,v 1.2 2011/01/24 21:07:28 jakllsch Exp $ */
+/* $NetBSD: mvsocgpp.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $ */
/*
* Copyright (c) 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.2 2011/01/24 21:07:28 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsocgpp.c,v 1.3 2011/08/13 15:38:47 jakllsch Exp $");
#include "gpio.h"
@@ -284,10 +284,11 @@
pending &= (0xff << mvsocgpp_pic->group);
pending &= (MVSOCGPP_READ(sc, MVSOCGPP_GPIOIM(pin)) |
MVSOCGPP_READ(sc, MVSOCGPP_GPIOILM(pin)));
+
if (pending == 0)
return 0;
- pic_mark_pending_sources(pic, 0, pending);
- return 1;
+
+ return pic_mark_pending_sources(pic, 0, pending);
}
static void
