[PATCH 3/3] drm/mediatek: Use devm variant for pm_runtime_enable() when possible

[CK Hu (胡俊光)]

Hi, Angelo:

On Thu, 2023-06-08 at 12:12 +0200, AngeloGioacchino Del Regno wrote:
>  	 
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
>  Simplify the error path of return functions and drop the call to
> pm_runtime_disable() in remove functions by switching to
> devm_pm_runtime_enable() where possible.

Reviewed-by: CK Hu <ck.hu at mediatek.com>

> 
> Signed-off-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno at collabora.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c |  9 ++++-----
>  drivers/gpu/drm/mediatek/mtk_disp_rdma.c        | 11 ++++-------
>  drivers/gpu/drm/mediatek/mtk_mdp_rdma.c         | 10 +++++-----
>  3 files changed, 13 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> index 1993b688befa..14e8ad6c78c3 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
> @@ -519,13 +519,13 @@ static int mtk_disp_ovl_adaptor_probe(struct
> platform_device *pdev)
>  
>  	component_master_add_with_match(dev,
> &mtk_disp_ovl_adaptor_master_ops, match);
>  
> -	pm_runtime_enable(dev);
> +	ret = devm_pm_runtime_enable(dev);
> +	if (ret)
> +		return ret;
>  
>  	ret = component_add(dev, &mtk_disp_ovl_adaptor_comp_ops);
> -	if (ret) {
> -		pm_runtime_disable(dev);
> +	if (ret)
>  		return dev_err_probe(dev, ret, "Failed to add
> component\n");
> -	}
>  
>  	return 0;
>  }
> @@ -533,7 +533,6 @@ static int mtk_disp_ovl_adaptor_probe(struct
> platform_device *pdev)
>  static int mtk_disp_ovl_adaptor_remove(struct platform_device *pdev)
>  {
>  	component_master_del(&pdev->dev,
> &mtk_disp_ovl_adaptor_master_ops);
> -	pm_runtime_disable(&pdev->dev);
>  	return 0;
>  }
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> index 307be35b59fc..5e90b6d593f5 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> @@ -361,13 +361,13 @@ static int mtk_disp_rdma_probe(struct
> platform_device *pdev)
>  
>  	platform_set_drvdata(pdev, priv);
>  
> -	pm_runtime_enable(dev);
> +	ret = devm_pm_runtime_enable(dev);
> +	if (ret)
> +		return ret;
>  
>  	ret = component_add(dev, &mtk_disp_rdma_component_ops);
> -	if (ret) {
> -		pm_runtime_disable(dev);
> +	if (ret)
>  		return dev_err_probe(dev, ret, "Failed to add
> component\n");
> -	}
>  
>  	return 0;
>  }
> @@ -375,9 +375,6 @@ static int mtk_disp_rdma_probe(struct
> platform_device *pdev)
>  static int mtk_disp_rdma_remove(struct platform_device *pdev)
>  {
>  	component_del(&pdev->dev, &mtk_disp_rdma_component_ops);
> -
> -	pm_runtime_disable(&pdev->dev);
> -
>  	return 0;
>  }
>  
> diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
> b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
> index ed519b5a3273..93ef05ec9720 100644
> --- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
> @@ -300,20 +300,20 @@ static int mtk_mdp_rdma_probe(struct
> platform_device *pdev)
>  #endif
>  	platform_set_drvdata(pdev, priv);
>  
> -	pm_runtime_enable(dev);
> +	ret = devm_pm_runtime_enable(dev);
> +	if (ret)
> +		return ret;
>  
>  	ret = component_add(dev, &mtk_mdp_rdma_component_ops);
> -	if (ret) {
> -		pm_runtime_disable(dev);
> +	if (ret)
>  		return dev_err_probe(dev, ret, "Failed to add
> component\n");
> -	}
> +
>  	return 0;
>  }
>  
>  static int mtk_mdp_rdma_remove(struct platform_device *pdev)
>  {
>  	component_del(&pdev->dev, &mtk_mdp_rdma_component_ops);
> -	pm_runtime_disable(&pdev->dev);
>  	return 0;
>  }
>  
> -- 
> 2.40.1