Re: [PATCHv4 12/15] dmaengine: fsldma: use devm_of_iomap() to simplify code

[Frank Li <Frank.li@oss.nxp.com>]

On Wed, Jun 10, 2026 at 08:52:42PM -0700, Rosen Penev wrote:
> Replace of_iomap() with devm_of_iomap() for per-channel register
> mappings. This eliminates the iounmap calls in both the probe
> error path and fsl_dma_chan_remove, and simplifies the error
> handling by returning directly on failure.
>
> Assisted-by: opencode:big-pickle
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---

Reviewed-by: Frank Li <Frank.Li@nxp.com>

>  drivers/dma/fsldma.c | 27 +++++++--------------------
>  1 file changed, 7 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
> index 0df09789187d..dc70a6bf5723 100644
> --- a/drivers/dma/fsldma.c
> +++ b/drivers/dma/fsldma.c
> @@ -1119,18 +1119,13 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
>  		return -ENOMEM;
>
>  	/* ioremap registers for use */
> -	chan->regs = of_iomap(node, 0);
> -	if (!chan->regs) {
> -		dev_err(fdev->dev, "unable to ioremap registers\n");
> -		err = -ENOMEM;
> -		goto out_free_chan;
> -	}
> +	chan->regs = devm_of_iomap(fdev->dev, node, 0, NULL);
> +	if (IS_ERR(chan->regs))
> +		return dev_err_probe(fdev->dev, PTR_ERR(chan->regs), "unable to ioremap registers\n");
>
>  	err = of_address_to_resource(node, 0, &res);
> -	if (err) {
> -		dev_err(fdev->dev, "unable to find 'reg' property\n");
> -		goto out_iounmap_regs;
> -	}
> +	if (err)
> +		return dev_err_probe(fdev->dev, err, "unable to find 'reg' property\n");
>
>  	chan->feature = feature;
>  	if (!fdev->feature)
> @@ -1146,11 +1141,8 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
>  	chan->id = (res.start & 0xfff) < 0x300 ?
>  		   ((res.start - 0x100) & 0xfff) >> 7 :
>  		   ((res.start - 0x200) & 0xfff) >> 7;
> -	if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) {
> -		dev_err(fdev->dev, "too many channels for device\n");
> -		err = -EINVAL;
> -		goto out_iounmap_regs;
> -	}
> +	if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE)
> +		return dev_err_probe(fdev->dev, -EINVAL, "too many channels for device\n");
>
>  	fdev->chan[chan->id] = chan;
>  	tasklet_setup(&chan->tasklet, dma_do_tasklet);
> @@ -1195,10 +1187,6 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev,
>  		 chan->irq ? chan->irq : fdev->irq);
>
>  	return 0;
> -
> -out_iounmap_regs:
> -	iounmap(chan->regs);
> -	return err;
>  }
>
>  static void fsl_dma_chan_remove(struct fsldma_chan *chan)
> @@ -1209,7 +1197,6 @@ static void fsl_dma_chan_remove(struct fsldma_chan *chan)
>
>  	tasklet_kill(&chan->tasklet);
>  	list_del(&chan->common.device_node);
> -	iounmap(chan->regs);
>  }
>
>  static void fsldma_device_release(struct dma_device *dma_dev);
> --
> 2.54.0
>