spi: davinci: Use 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: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230706032727.9180-2-frank.li@vivo.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index b04811c911e2ca7138186a685db34037c7cf5916..a85fd0cb4a5e2529a2e3a8e2b1370038c1c19c1a 100644 (file)
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -895,25 +895,16 @@ static int davinci_spi_probe(struct platform_device *pdev)
                goto free_master;
        }
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (r == NULL) {
-               ret = -ENOENT;
-               goto free_master;
-       }
-
-       dspi->pbase = r->start;
-
-       dspi->base = devm_ioremap_resource(&pdev->dev, r);
+       dspi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
        if (IS_ERR(dspi->base)) {
                ret = PTR_ERR(dspi->base);
                goto free_master;
        }
+       dspi->pbase = r->start;
 
        init_completion(&dspi->done);
 
        ret = platform_get_irq(pdev, 0);
-       if (ret == 0)
-               ret = -EINVAL;
        if (ret < 0)
                goto free_master;
        dspi->irq = ret;