On Tue, Jun 09, 2026 at 03:19:19PM -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.
Nit: The controller IRQ is optional when absent (-ENXIO) and driver falls back to use 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]> Reviewed-by: Frank Li <[email protected]> > --- > drivers/dma/fsldma.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c > index c04a7fbd2ed0..eba194d64105 100644 > --- a/drivers/dma/fsldma.c > +++ b/drivers/dma/fsldma.c > @@ -1213,7 +1213,6 @@ static void fsl_dma_chan_remove(struct fsldma_chan > *chan) > spin_unlock_bh(&chan->desc_lock); > > tasklet_kill(&chan->tasklet); > - irq_dispose_mapping(chan->irq); > list_del(&chan->common.device_node); > iounmap(chan->regs); > kfree(chan); > @@ -1248,7 +1247,14 @@ 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; > + goto out_iounmap; > + } > + fdev->irq = 0; > + } > > dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask); > dma_cap_set(DMA_SLAVE, fdev->common.cap_mask); > @@ -1317,7 +1323,7 @@ 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); > +out_iounmap: > iounmap(fdev->regs); > out_free: > kfree(fdev); > @@ -1353,7 +1359,6 @@ static void fsldma_of_remove(struct platform_device *op) > if (chans[i]) > fsl_dma_chan_remove(chans[i]); > } > - irq_dispose_mapping(fdev->irq); > > iounmap(fdev->regs); > kfree(fdev); > -- > 2.54.0 >
