Remove duplicated code by implementing a proper if/else.

Signed-off-by: Christophe Leroy <[email protected]>
---
 arch/powerpc/kernel/irq.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index e5b7fb5282ee..b007f16ccbd3 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -280,14 +280,11 @@ void __do_IRQ(struct pt_regs *regs)
        irqsp = hardirq_ctx[raw_smp_processor_id()];
        sirqsp = softirq_ctx[raw_smp_processor_id()];
 
-       /* Already there ? */
-       if (unlikely(cursp == irqsp || cursp == sirqsp)) {
+       /* Already there ? If not switch stack and call */
+       if (unlikely(cursp == irqsp || cursp == sirqsp))
                __do_irq(regs, current_stack_pointer);
-               set_irq_regs(old_regs);
-               return;
-       }
-       /* Switch stack and call */
-       call_do_irq(regs, irqsp);
+       else
+               call_do_irq(regs, irqsp);
 
        set_irq_regs(old_regs);
 }
-- 
2.35.3

Reply via email to