Home » Mailing list archives » linux-kernel » 2008 » September » 17

Re: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative

Previous thread: [PATCH] Fix declaration of cgroup_mm_owner_callbacks() by Paul Menage on Monday, September 15, 2008 - 11:41 am. (2 messages)

Next thread: [PATCH -mm] aio: fix sysctl build error by Randy Dunlap on Monday, September 15, 2008 - 11:59 am. (1 message)
[view original message]
From: roel kluin
Subject: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative
Date: Monday, September 15, 2008 - 5:50 pm

unsigned irq cannot be negative

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index cba36a2..92dd1a0 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq)
 	cascade = irq_cascade + irq;
 	if (cascade->get_irq != NULL) {
 		unsigned int source_irq = irq;
+		int ret;
 		desc = irq_desc + source_irq;
 		if (desc->chip->mask_ack)
 			desc->chip->mask_ack(source_irq);
@@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq)
 			desc->chip->mask(source_irq);
 			desc->chip->ack(source_irq);
 		}
-		irq = cascade->get_irq(irq);
-		if (irq < 0)
+		ret = cascade->get_irq(irq);
+		irq = ret;
+		if (ret < 0)
 			atomic_inc(&irq_err_count);
 		else
 			irq_dispatch(irq);
--


[ message continues ]
[view original message]
From: Yoichi Yuasa
Subject: Re: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative
Date: Monday, September 15, 2008 - 7:02 pm

On Mon, 15 Sep 2008 20:50:54 -0400

Acked-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

Yoichi
--


[ message continues ]
[view original message]
From: Ralf Baechle
Subject: Re: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative
Date: Tuesday, September 16, 2008 - 1:58 am

On Mon, Sep 15, 2008 at 08:50:54PM -0400, roel kluin wrote:

Thanks, applied.

  Ralf
--


[ message continues ]
[view original message]
From: Sergei Shtylyov
Subject: Re: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative
Date: Tuesday, September 16, 2008 - 3:44 am

Hello.



  How about this:

		ret = cascade->get_irq(irq);
		if (ret < 0)
 			atomic_inc(&irq_err_count);
 		else
 			irq_dispatch(ret);


WBR, Sergei


--


[ message continues ]
[view original message]
From: roel kluin
Subject: Re: [PATCH] [MIPS] vr41xx: unsigned irq cannot be negative
Date: Tuesday, September 16, 2008 - 6:54 pm

good suggestion, but shouldn't we then remove source_irq
as well?

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index cba36a2..ab4e327 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -63,6 +63,7 @@ static void irq_dispatch(unsigned int irq)
 {
 	irq_cascade_t *cascade;
 	struct irq_desc *desc;
+	int ret;
 
 	if (irq >= NR_IRQS) {
 		atomic_inc(&irq_err_count);
@@ -71,21 +72,22 @@ static void irq_dispatch(unsigned int irq)
 
 	cascade = irq_cascade + irq;
 	if (cascade->get_irq != NULL) {
-		unsigned int source_irq = irq;
-		desc = irq_desc + source_irq;
+		desc = irq_desc + irq;
 		if (desc->chip->mask_ack)
-			desc->chip->mask_ack(source_irq);
+			desc->chip->mask_ack(irq);
 		else {
-			desc->chip->mask(source_irq);
-			desc->chip->ack(source_irq);
+			desc->chip->mask(irq);
+			desc->chip->ack(irq);
 		}
-		irq = cascade->get_irq(irq);
-		if (irq < 0)
+
+		ret = cascade->get_irq(irq);
+		if (ret < 0)
 			atomic_inc(&irq_err_count);
 		else
-			irq_dispatch(irq);
+			irq_dispatch(ret);
+
 		if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
-			desc->chip->unmask(source_irq);
+			desc->chip->unmask(irq);
 	} else
 		do_IRQ(irq);
 }

--


[ message continues ]
Previous thread: [PATCH] Fix declaration of cgroup_mm_owner_callbacks() by Paul Menage on Monday, September 15, 2008 - 11:41 am. (2 messages)

Next thread: [PATCH -mm] aio: fix sysctl build error by Randy Dunlap on Monday, September 15, 2008 - 11:59 am. (1 message)