diff options
| author | Rob Herring <robh@kernel.org> | 2015-07-27 16:55:15 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-08-19 12:01:58 -0400 |
| commit | 2f27b81c0e5670fbdd902ca8f85617153d69b8cb (patch) | |
| tree | 67463e1575cbe50fd9bace4cfc32a2fe6ac372ab | |
| parent | d078cd1b4185134fe861e2b16a40ba14efb307b7 (diff) | |
dmaengine: kill off set_irq_flags usage
set_irq_flags is ARM specific with custom flags which have genirq
equivalents. Convert drivers to use the genirq interfaces directly, so we
can kill off set_irq_flags. The translation of flags is as follows:
IRQF_VALID -> !IRQ_NOREQUEST
IRQF_PROBE -> !IRQ_NOPROBE
IRQF_NOAUTOEN -> IRQ_NOAUTOEN
For IRQs managed by an irqdomain, the irqdomain core code handles clearing
and setting IRQ_NOREQUEST already, so there is no need to do this in
.map() functions and we can simply remove the set_irq_flags calls. Some
users also modify IRQ_NOPROBE and this has been maintained although it
is not clear that is really needed. There appears to be a great deal of
blind copy and paste of this code.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/ipu/ipu_irq.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index fc6506b12278..7489d2a5d246 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c | |||
| @@ -341,9 +341,7 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev) | |||
| 341 | irq_map[i].irq = irq; | 341 | irq_map[i].irq = irq; |
| 342 | irq_map[i].source = -EINVAL; | 342 | irq_map[i].source = -EINVAL; |
| 343 | irq_set_handler(irq, handle_level_irq); | 343 | irq_set_handler(irq, handle_level_irq); |
| 344 | #ifdef CONFIG_ARM | 344 | irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); |
| 345 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | ||
| 346 | #endif | ||
| 347 | } | 345 | } |
| 348 | 346 | ||
| 349 | irq_set_chained_handler_and_data(ipu->irq_fn, ipu_irq_handler, ipu); | 347 | irq_set_chained_handler_and_data(ipu->irq_fn, ipu_irq_handler, ipu); |
| @@ -366,9 +364,7 @@ void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev) | |||
| 366 | irq_set_chained_handler_and_data(ipu->irq_err, NULL, NULL); | 364 | irq_set_chained_handler_and_data(ipu->irq_err, NULL, NULL); |
| 367 | 365 | ||
| 368 | for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) { | 366 | for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) { |
| 369 | #ifdef CONFIG_ARM | 367 | irq_set_status_flags(irq, IRQ_NOREQUEST); |
| 370 | set_irq_flags(irq, 0); | ||
| 371 | #endif | ||
| 372 | irq_set_chip(irq, NULL); | 368 | irq_set_chip(irq, NULL); |
| 373 | irq_set_chip_data(irq, NULL); | 369 | irq_set_chip_data(irq, NULL); |
| 374 | } | 370 | } |
