Commit d7fdb356 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Vinod Koul

dmaengine: ipu: Consolidate chained IRQ handler install/remove

Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.

Search and conversion was done with coccinelle.
Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 03734485
...@@ -382,11 +382,9 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev) ...@@ -382,11 +382,9 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev)
#endif #endif
} }
irq_set_handler_data(ipu->irq_fn, ipu); irq_set_chained_handler_and_data(ipu->irq_fn, ipu_irq_fn, ipu);
irq_set_chained_handler(ipu->irq_fn, ipu_irq_fn);
irq_set_handler_data(ipu->irq_err, ipu); irq_set_chained_handler_and_data(ipu->irq_err, ipu_irq_err, ipu);
irq_set_chained_handler(ipu->irq_err, ipu_irq_err);
ipu->irq_base = irq_base; ipu->irq_base = irq_base;
...@@ -399,11 +397,9 @@ void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev) ...@@ -399,11 +397,9 @@ void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev)
irq_base = ipu->irq_base; irq_base = ipu->irq_base;
irq_set_chained_handler(ipu->irq_fn, NULL); irq_set_chained_handler_and_data(ipu->irq_fn, NULL, NULL);
irq_set_handler_data(ipu->irq_fn, NULL);
irq_set_chained_handler(ipu->irq_err, NULL); irq_set_chained_handler_and_data(ipu->irq_err, NULL, NULL);
irq_set_handler_data(ipu->irq_err, NULL);
for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) { for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) {
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment