tags is dmaengine: fsldma: On Wed, Jun 03, 2026 at 12:19:51PM -0700, Rosen Penev wrote: > Replace the per-controller irq_of_parse_and_map() call with > platform_get_irq_optional(). The controller IRQ is optional — when > absent (-ENXIO) the driver falls back to per-channel IRQs. Any other > error is treated as fatal. The corresponding irq_dispose_mapping() > calls in the probe error path and remove function are removed. > > The per-channel IRQ mapping in fsl_dma_chan_probe() uses a child > device_node rather than the platform device's of_node, so it is not > converted here. > > Assisted-by: opencode:big-pickle > Signed-off-by: Rosen Penev <[email protected]> > --- > drivers/dma/fsldma.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c > index 98d02809ade5..08a8090178f8 100644 > --- a/drivers/dma/fsldma.c > +++ b/drivers/dma/fsldma.c > @@ -1239,7 +1239,16 @@ static int fsldma_of_probe(struct platform_device *op) > } > > /* map the channel IRQ if it exists, but don't hookup the handler yet */ > - fdev->irq = irq_of_parse_and_map(op->dev.of_node, 0); > + fdev->irq = platform_get_irq_optional(op, 0); > + if (fdev->irq < 0) { > + if (fdev->irq != -ENXIO) { > + err = fdev->irq; > + iounmap(fdev->regs); > + kfree(fdev);
should goto below error label Frank > + return err; > + } > + fdev->irq = 0; > + } > > dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask); > dma_cap_set(DMA_SLAVE, fdev->common.cap_mask); > @@ -1301,7 +1310,6 @@ static int fsldma_of_probe(struct platform_device *op) > if (fdev->chan[i]) > fsl_dma_chan_remove(fdev->chan[i]); > } > - irq_dispose_mapping(fdev->irq); > iounmap(fdev->regs); > out_free: > kfree(fdev); > @@ -1323,7 +1331,6 @@ static void fsldma_of_remove(struct platform_device *op) > if (fdev->chan[i]) > fsl_dma_chan_remove(fdev->chan[i]); > } > - irq_dispose_mapping(fdev->irq); > > iounmap(fdev->regs); > kfree(fdev); > -- > 2.54.0 >
