Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/marvell In *find_pending_irqs() return the valu...



details:   https://anonhg.NetBSD.org/src/rev/5690ceb029c3
branches:  trunk
changeset: 768269:5690ceb029c3
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Aug 13 15:38:47 2011 +0000

description:
In *find_pending_irqs() return the value of pic_mark_pending_sources() instead
of 1.  Changed to match other ARM PIC code.

diffstat:

 sys/arch/arm/marvell/mvsoc_intr.c |  9 +++++----
 sys/arch/arm/marvell/mvsocgpp.c   |  9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 01eeca945728 -r 5690ceb029c3 sys/arch/arm/marvell/mvsoc_intr.c
--- a/sys/arch/arm/marvell/mvsoc_intr.c Sat Aug 13 14:51:58 2011 +0000
+++ b/sys/arch/arm/marvell/mvsoc_intr.c Sat Aug 13 15:38:47 2011 +0000
@@ -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 */
diff -r 01eeca945728 -r 5690ceb029c3 sys/arch/arm/marvell/mvsocgpp.c
--- a/sys/arch/arm/marvell/mvsocgpp.c   Sat Aug 13 14:51:58 2011 +0000
+++ b/sys/arch/arm/marvell/mvsocgpp.c   Sat Aug 13 15:38:47 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index