Skip to contentSkip to conversation

vr41xx: unsigned irq cannot be negative

PATCH Applied roel kluin 4 participants 5 messages Sep 15, 2008 – Sep 16, 2008 MIPS

lore
Share & tools
lore

roel kluin

author
#0 lore raw

PATCH 1/1 vr41xx: unsigned irq cannot be negative

unsigned irq cannot be negative

Signed-off-by Roel Kluin <[email protected]>

---

arch/mips/vr41xx/common/irq.c +4 -2
index cba36a2..92dd1a0 100644
@@ -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);
#3 lore raw
In reply to roel kluin

Hello.

Quoted 9 lines · roel kluin

unsigned irq cannot be negative

Signed-off-by Roel Kluin <[email protected]>

---

arch/mips/vr41xx/common/irq.c +0 -0
index cba36a2..92dd1a0 100644

arch/mips/vr41xx/common/irq.c static void irq_dispatch(unsigned int irq) · line 76

Quoted 5 lines
arch/mips/vr41xx/common/irq.c +1 -0
@@ -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;

Keep an empty line after the declaration block please.

arch/mips/vr41xx/common/irq.c static void irq_dispatch(unsigned int irq) · line 88

Quoted 13 lines
arch/mips/vr41xx/common/irq.c +3 -2
@@ -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);

How about this:

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

WBR, Sergei

author
#4 lore raw
Quoted 18 lines · Sergei Shtylyov

Hello.

Review static void irq_dispatch(unsigned int irq) · line 88

Quoted 13 lines
(quoted diff) +3 -2
@@ -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);

How about this:

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

WBR, Sergei

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

Signed-off-by Roel Kluin <[email protected]>

---

arch/mips/vr41xx/common/irq.c +11 -9
index cba36a2..ab4e327 100644
@@ -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);
 }