projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'riscv-for-linus-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
irqchip
/
irq-ingenic.c
diff --git
a/drivers/irqchip/irq-ingenic.c
b/drivers/irqchip/irq-ingenic.c
index
c5589ee
..
9f3da42
100644
(file)
--- a/
drivers/irqchip/irq-ingenic.c
+++ b/
drivers/irqchip/irq-ingenic.c
@@
-58,11
+58,6
@@
static irqreturn_t intc_cascade(int irq, void *data)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static struct irqaction intc_cascade_action = {
- .handler = intc_cascade,
- .name = "SoC intc cascade interrupt",
-};
-
static int __init ingenic_intc_of_init(struct device_node *node,
unsigned num_chips)
{
static int __init ingenic_intc_of_init(struct device_node *node,
unsigned num_chips)
{
@@
-130,7
+125,9
@@
static int __init ingenic_intc_of_init(struct device_node *node,
irq_reg_writel(gc, IRQ_MSK(32), JZ_REG_INTC_SET_MASK);
}
irq_reg_writel(gc, IRQ_MSK(32), JZ_REG_INTC_SET_MASK);
}
- setup_irq(parent_irq, &intc_cascade_action);
+ if (request_irq(parent_irq, intc_cascade, 0,
+ "SoC intc cascade interrupt", NULL))
+ pr_err("Failed to register SoC intc cascade interrupt\n");
return 0;
out_domain_remove:
return 0;
out_domain_remove: