RE: [PATCH -next v2] spi: spi-fsl-qspi: Fix return value check of devm_ioremap() in probe

[Han Xu <han.xu@xxxxxxx>]

> -----Original Message-----
> From: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
> Sent: Tuesday, April 21, 2020 8:46 PM
> To: Han Xu <han.xu@xxxxxxx>; Mark Brown <broonie@xxxxxxxxxx>; Ashish
> Kumar <ashish.kumar@xxxxxxx>
> Cc: Wei Yongjun <weiyongjun1@xxxxxxxxxx>; linux-spi@xxxxxxxxxxxxxxx; kernel-
> janitors@xxxxxxxxxxxxxxx
> Subject: [PATCH -next v2] spi: spi-fsl-qspi: Fix return value check of
> devm_ioremap() in probe
> 
> In case of error, the function devm_ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be replaced with
> NULL test.
> 
> Fixes: 858e26a515c2 ("spi: spi-fsl-qspi: Reduce devm_ioremap size to 4 times AHB
> buffer size")
> Signed-off-by: Wei Yongjun <weiyongjun1@xxxxxxxxxx>
> Reviewed-by: Ashish Kumar <Ashish.Kumar@xxxxxxx>

Acked-by: Han Xu <han.xu@xxxxxxx>

> ---
> v1 -> v2: fix the subject as Ashish's suggest
> ---
>  drivers/spi/spi-fsl-qspi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c index
> 83eb8a484faf..6766262d7e75 100644
> --- a/drivers/spi/spi-fsl-qspi.c
> +++ b/drivers/spi/spi-fsl-qspi.c
> @@ -880,8 +880,8 @@ static int fsl_qspi_probe(struct platform_device *pdev)
>  	/* Since there are 4 cs, map size required is 4 times ahb_buf_size */
>  	q->ahb_addr = devm_ioremap(dev, q->memmap_phy,
>  				   (q->devtype_data->ahb_buf_size * 4));
> -	if (IS_ERR(q->ahb_addr)) {
> -		ret = PTR_ERR(q->ahb_addr);
> +	if (!q->ahb_addr) {
> +		ret = -ENOMEM;
>  		goto err_put_ctrl;
>  	}
> 
>