Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kind of revert "powerpc: 52xx: provide a default in mpc52xx_irqhost_map()"

Browse Source 
This more or less reverts commit 6391f697d4.
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>
This commit is contained in:
Wolfram Sang 2013-10-04 17:37:09 +02:00 committed by Anatolij Gustschin
parent 45d20e8348
commit 509a02df44
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/platforms/52xx/mpc52xx_pic.c
View File

@ -340,7 +340,7 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
{ {
int l1irq; int l1irq;
int l2irq; int l2irq;
struct irq_chip *irqchip; struct irq_chip *uninitialized_var(irqchip);
void *hndlr; void *hndlr;
int type; int type;
u32 reg; u32 reg;
@ -373,9 +373,8 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
case MPC52xx_IRQ_L1_CRIT: case MPC52xx_IRQ_L1_CRIT:
default:
pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n", pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
__func__, l1irq); __func__, l2irq);
irq_set_chip(virq, &no_irq_chip); irq_set_chip(virq, &no_irq_chip);
return 0; return 0;
} }