mmc: pxamci: 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/20230704131939.22562-3-frank.li@vivo.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 2a988f942b6cae668f557de5658c79c712886183..1142cd2368f66104d123fe4e33ef27f31d20fccb 100644 (file)
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -612,7 +612,6 @@ static int pxamci_probe(struct platform_device *pdev)
        struct resource *r;
        int ret, irq;
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
@@ -685,14 +684,14 @@ static int pxamci_probe(struct platform_device *pdev)
        }
 
        spin_lock_init(&host->lock);
-       host->res = r;
        host->imask = MMC_I_MASK_ALL;
 
-       host->base = devm_ioremap_resource(dev, r);
+       host->base = devm_platform_get_and_ioremap_resource(pdev, 0, &r);
        if (IS_ERR(host->base)) {
                ret = PTR_ERR(host->base);
                goto out;
        }
+       host->res = r;
 
        /*
         * Ensure that the host controller is shut down, and setup