On Tue, 4 Jul 2023 at 15:19, Yangtao Li <frank.li@xxxxxxxx> wrote:
>
> 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@xxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/pxamci.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
> index 2a988f942b6c..1142cd2368f6 100644
> --- 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
> --
> 2.39.0
>
