44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 0939f949f9c72833e5b1a718bd5b4546873b0b38 Mon Sep 17 00:00:00 2001
|
|
From: Wolfram Sang <wsa@the-dreams.de>
|
|
Date: Fri, 4 Oct 2013 17:37:09 +0200
|
|
Subject: [PATCH] Kind of revert "powerpc: 52xx: provide a default in
|
|
mpc52xx_irqhost_map()"
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.12/patches-3.12.6-rt9.tar.xz
|
|
|
|
This more or less reverts commit 6391f697d4892a6f233501beea553e13f7745a23.
|
|
Instead of adding an unneeded 'default', mark the variable to prevent
|
|
the false positive 'uninitialized var'. The other change (fixing the
|
|
printout) needs revert, too. We want to know WHICH critical irq failed,
|
|
not which level it had.
|
|
|
|
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
|
|
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Cc: Anatolij Gustschin <agust@denx.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
|
|
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
|
|
@@ -340,7 +340,7 @@ static int mpc52xx_irqhost_map(struct ir
|
|
{
|
|
int l1irq;
|
|
int l2irq;
|
|
- struct irq_chip *irqchip;
|
|
+ struct irq_chip *uninitialized_var(irqchip);
|
|
void *hndlr;
|
|
int type;
|
|
u32 reg;
|
|
@@ -373,9 +373,8 @@ static int mpc52xx_irqhost_map(struct ir
|
|
case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
|
|
case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
|
|
case MPC52xx_IRQ_L1_CRIT:
|
|
- default:
|
|
pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
|
|
- __func__, l1irq);
|
|
+ __func__, l2irq);
|
|
irq_set_chip(virq, &no_irq_chip);
|
|
return 0;
|
|
}
|