1 files changed, 6 insertions, 7 deletions

diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 39c08254b0f1..f7e2c7807d7b 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -677,8 +677,9 @@ void smtc_set_irq_affinity(unsigned int irq, cpumask_t affinity)
          */
 }
 
-void smtc_forward_irq(unsigned int irq)
+void smtc_forward_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
         int target;
 
         /*
@@ -692,7 +693,7 @@ void smtc_forward_irq(unsigned int irq)
          * and efficiency, we just pick the easiest one to find.
          */
 
-        target = cpumask_first(irq_desc[irq].affinity);
+        target = cpumask_first(d->affinity);
 
         /*
          * We depend on the platform code to have correctly processed
@@ -707,12 +708,10 @@ void smtc_forward_irq(unsigned int irq)
          */
 
         /* If no one is eligible, service locally */
-        if (target >= NR_CPUS) {
+        if (target >= NR_CPUS)
                 do_IRQ_no_affinity(irq);
-                return;
-        }
-
-        smtc_send_ipi(target, IRQ_AFFINITY_IPI, irq);
+        else
+                smtc_send_ipi(target, IRQ_AFFINITY_IPI, irq);
 }
 
 #endif /* CONFIG_MIPS_MT_SMTC_IRQAFF */