summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-ompic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/irqchip/irq-ompic.c')
-rw-r--r--drivers/irqchip/irq-ompic.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/irqchip/irq-ompic.c b/drivers/irqchip/irq-ompic.c
index e66ef4373b1e..f0e0b435bb1d 100644
--- a/drivers/irqchip/irq-ompic.c
+++ b/drivers/irqchip/irq-ompic.c
@@ -84,6 +84,8 @@ DEFINE_PER_CPU(unsigned long, ops);
static void __iomem *ompic_base;
+static DEFINE_PER_CPU_READ_MOSTLY(int, ipi_dummy_dev);
+
static inline u32 ompic_readreg(void __iomem *base, loff_t offset)
{
return ioread32be(base + offset);
@@ -183,12 +185,17 @@ static int __init ompic_of_init(struct device_node *node,
goto out_unmap;
}
- ret = request_irq(irq, ompic_ipi_handler, IRQF_PERCPU,
- "ompic_ipi", NULL);
- if (ret)
+ irq_set_percpu_devid(irq);
+ ret = request_percpu_irq(irq, ompic_ipi_handler, "ompic_ipi",
+ &ipi_dummy_dev);
+
+ if (ret) {
+ pr_err("ompic: failed to request irq %d, error: %d",
+ irq, ret);
goto out_irq_disp;
+ }
- set_smp_cross_call(ompic_raise_softirq);
+ set_smp_cross_call(ompic_raise_softirq, irq);
return 0;