projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index
6bc07d8
..
ed69c7e
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@
-51,7
+51,7
@@
static void mpc85xx_8259_cascade(struct irq_desc *desc)
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq();
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cascade_irq = i8259_irq();
- if (cascade_irq
!= NO_IRQ
) {
+ if (cascade_irq) {
generic_handle_irq(cascade_irq);
}
chip->irq_eoi(&desc->irq_data);
generic_handle_irq(cascade_irq);
}
chip->irq_eoi(&desc->irq_data);
@@
-96,7
+96,7
@@
void __init mpc85xx_ds_pic_init(void)
}
cascade_irq = irq_of_parse_and_map(cascade_node, 0);
}
cascade_irq = irq_of_parse_and_map(cascade_node, 0);
- if (
cascade_irq == NO_IRQ
) {
+ if (
!cascade_irq
) {
printk(KERN_ERR "Failed to map cascade interrupt\n");
return;
}
printk(KERN_ERR "Failed to map cascade interrupt\n");
return;
}