[PATCH -next] spi: xilinx: Use devm_platform_get_and_ioremap_resource()

[Tudor Ambarus]

On 3/28/23 07:15, Yang Li wrote:
> According to commit 890cc39a8799 ("drivers: provide
> devm_platform_get_and_ioremap_resource()"), convert
> platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
> 
> Signed-off-by: Yang Li <yang.lee at linux.alibaba.com>
> ---
>  drivers/spi/spi-xilinx.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
> index 5dd3d1901412..8e6e3876aa9a 100644
> --- a/drivers/spi/spi-xilinx.c
> +++ b/drivers/spi/spi-xilinx.c
> @@ -440,8 +440,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
>  	xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;
>  	init_completion(&xspi->done);
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	xspi->regs = devm_ioremap_resource(&pdev->dev, res);
> +	xspi->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
>  	if (IS_ERR(xspi->regs))
>  		return PTR_ERR(xspi->regs);
>  

So we keep the local var res just to print its value? Wouldn't have been
better to have something like:

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 1411548f4255..693be1eacaca 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -391,7 +391,6 @@ static int xilinx_spi_probe(struct platform_device
*pdev)
 {
        struct xilinx_spi *xspi;
        struct xspi_platform_data *pdata;
-       struct resource *res;
        int ret, num_cs = 0, bits_per_word;
        struct spi_master *master;
        bool force_irq = false;
@@ -440,8 +439,7 @@ static int xilinx_spi_probe(struct platform_device
*pdev)
        xspi->bitbang.txrx_bufs = xilinx_spi_txrx_bufs;
        init_completion(&xspi->done);

-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       xspi->regs = devm_ioremap_resource(&pdev->dev, res);
+       xspi->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(xspi->regs))
                return PTR_ERR(xspi->regs);

@@ -493,7 +491,7 @@ static int xilinx_spi_probe(struct platform_device
*pdev)
                return ret;
        }

-       dev_info(&pdev->dev, "at %pR, irq=%d\n", res, xspi->irq);
+       dev_info(&pdev->dev, "irq=%d\n", xspi->irq);

        if (pdata) {
                for (i = 0; i < pdata->num_devices; i++)

---

I would get rid of printing xspi->irq too, as I don't see any benefit in
printing it, but that would be for another patch, as it is a different
logical change.