aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2013-10-04 11:37:09 -0400
committerAnatolij Gustschin <agust@denx.de>2013-10-30 17:34:14 -0400
commit509a02df44df8454b96da0b9bfcaa19f0a349df6 (patch)
treedabd965b3da56cf52ef10ee11fec0a9d5a2f9f84
parent45d20e8348969a165c53cfb91f445e7cc599a9f0 (diff)
Kind of revert "powerpc: 52xx: provide a default in mpc52xx_irqhost_map()"
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> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Anatolij Gustschin <agust@denx.de>
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_pic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index b69221ba07fd..2898b737deb7 100644
--- 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 irq_domain *h, unsigned int virq,
340{ 340{
341 int l1irq; 341 int l1irq;
342 int l2irq; 342 int l2irq;
343 struct irq_chip *irqchip; 343 struct irq_chip *uninitialized_var(irqchip);
344 void *hndlr; 344 void *hndlr;
345 int type; 345 int type;
346 u32 reg; 346 u32 reg;
@@ -373,9 +373,8 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
373 case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; 373 case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
374 case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; 374 case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
375 case MPC52xx_IRQ_L1_CRIT: 375 case MPC52xx_IRQ_L1_CRIT:
376 default:
377 pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n", 376 pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
378 __func__, l1irq); 377 __func__, l2irq);
379 irq_set_chip(virq, &no_irq_chip); 378 irq_set_chip(virq, &no_irq_chip);
380 return 0; 379 return 0;
381 } 380 }