[-next] mmc: owl-mmc: Use devm_platform_get_and_ioremap_resource()

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@linux.alibaba.com>
---
 drivers/mmc/host/owl-mmc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

On Wed, Mar 15, 2023 at 01:41:13PM +0800, 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@linux.alibaba.com>
> ---
>  drivers/mmc/host/owl-mmc.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
> index 3dc143b03939..6f9d31a886ba 100644
> --- a/drivers/mmc/host/owl-mmc.c
> +++ b/drivers/mmc/host/owl-mmc.c
> @@ -578,8 +578,7 @@ static int owl_mmc_probe(struct platform_device *pdev)
>  	owl_host->mmc = mmc;
>  	spin_lock_init(&owl_host->lock);
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

You forgot to remove the local variable which is now unused.

Thanks,
Mani

> -	owl_host->base = devm_ioremap_resource(&pdev->dev, res);
> +	owl_host->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
>  	if (IS_ERR(owl_host->base)) {
>  		ret = PTR_ERR(owl_host->base);
>  		goto err_free_host;
> -- 
> 2.20.1.7.g153144c
>

On Wed, 15 Mar 2023 at 06:41, Yang Li <yang.lee@linux.alibaba.com> 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@linux.alibaba.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/owl-mmc.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/owl-mmc.c b/drivers/mmc/host/owl-mmc.c
> index 3dc143b03939..6f9d31a886ba 100644
> --- a/drivers/mmc/host/owl-mmc.c
> +++ b/drivers/mmc/host/owl-mmc.c
> @@ -578,8 +578,7 @@ static int owl_mmc_probe(struct platform_device *pdev)
>         owl_host->mmc = mmc;
>         spin_lock_init(&owl_host->lock);
>
> -       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -       owl_host->base = devm_ioremap_resource(&pdev->dev, res);
> +       owl_host->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
>         if (IS_ERR(owl_host->base)) {
>                 ret = PTR_ERR(owl_host->base);
>                 goto err_free_host;
> --
> 2.20.1.7.g153144c
>