linux-kernel - Re: [PATCH 2/4] drm/msm/edp: convert to msm_clk_get()

Open Source and information security mailing list archives

Date:   Tue, 24 Oct 2017 08:13:08 -0400
From:   Sean Paul <seanpaul@...omium.org>
To:     Rob Clark <robdclark@...il.com>
Cc:     dri-devel@...ts.freedesktop.org, linux-arm-msm@...r.kernel.org,
        open list <linux-kernel@...r.kernel.org>,
        Masahiro Yamada <yamada.masahiro@...ionext.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        freedreno@...ts.freedesktop.org
Subject: Re: [PATCH 2/4] drm/msm/edp: convert to msm_clk_get()

On Tue, Oct 17, 2017 at 06:49:56AM -0400, Rob Clark wrote:
> We already have, as a result of upstreaming the gpu bindings,
> msm_clk_get() which will try to get the clock both without and with a
> "_clk" suffix.  Use this in eDP code so we can drop the "_clk" suffix
> in bindings while maintaing backwards compatibility.
> 
> Signed-off-by: Rob Clark <robdclark@...il.com>

Reviewed-by: Sean Paul <seanpaul@...omium.org>

> ---
>  drivers/gpu/drm/msm/edp/edp_ctrl.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
> index e32a4a4f3797..7c72264101ff 100644
> --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
> +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
> @@ -150,46 +150,46 @@ static const struct edp_pixel_clk_div clk_divs[2][EDP_PIXEL_CLK_NUM] = {
>  
>  static int edp_clk_init(struct edp_ctrl *ctrl)
>  {
> -	struct device *dev = &ctrl->pdev->dev;
> +	struct platform_device *pdev = ctrl->pdev;
>  	int ret;
>  
> -	ctrl->aux_clk = devm_clk_get(dev, "core_clk");
> +	ctrl->aux_clk = msm_clk_get(pdev, "core");
>  	if (IS_ERR(ctrl->aux_clk)) {
>  		ret = PTR_ERR(ctrl->aux_clk);
> -		pr_err("%s: Can't find aux_clk, %d\n", __func__, ret);
> +		pr_err("%s: Can't find core clock, %d\n", __func__, ret);
>  		ctrl->aux_clk = NULL;
>  		return ret;
>  	}
>  
> -	ctrl->pixel_clk = devm_clk_get(dev, "pixel_clk");
> +	ctrl->pixel_clk = msm_clk_get(pdev, "pixel");
>  	if (IS_ERR(ctrl->pixel_clk)) {
>  		ret = PTR_ERR(ctrl->pixel_clk);
> -		pr_err("%s: Can't find pixel_clk, %d\n", __func__, ret);
> +		pr_err("%s: Can't find pixel clock, %d\n", __func__, ret);
>  		ctrl->pixel_clk = NULL;
>  		return ret;
>  	}
>  
> -	ctrl->ahb_clk = devm_clk_get(dev, "iface_clk");
> +	ctrl->ahb_clk = msm_clk_get(pdev, "iface");
>  	if (IS_ERR(ctrl->ahb_clk)) {
>  		ret = PTR_ERR(ctrl->ahb_clk);
> -		pr_err("%s: Can't find ahb_clk, %d\n", __func__, ret);
> +		pr_err("%s: Can't find iface clock, %d\n", __func__, ret);
>  		ctrl->ahb_clk = NULL;
>  		return ret;
>  	}
>  
> -	ctrl->link_clk = devm_clk_get(dev, "link_clk");
> +	ctrl->link_clk = msm_clk_get(pdev, "link");
>  	if (IS_ERR(ctrl->link_clk)) {
>  		ret = PTR_ERR(ctrl->link_clk);
> -		pr_err("%s: Can't find link_clk, %d\n", __func__, ret);
> +		pr_err("%s: Can't find link clock, %d\n", __func__, ret);
>  		ctrl->link_clk = NULL;
>  		return ret;
>  	}
>  
>  	/* need mdp core clock to receive irq */
> -	ctrl->mdp_core_clk = devm_clk_get(dev, "mdp_core_clk");
> +	ctrl->mdp_core_clk = msm_clk_get(pdev, "mdp_core");
>  	if (IS_ERR(ctrl->mdp_core_clk)) {
>  		ret = PTR_ERR(ctrl->mdp_core_clk);
> -		pr_err("%s: Can't find mdp_core_clk, %d\n", __func__, ret);
> +		pr_err("%s: Can't find mdp_core clock, %d\n", __func__, ret);
>  		ctrl->mdp_core_clk = NULL;
>  		return ret;
>  	}
> -- 
> 2.13.6
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@...ts.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Sean Paul, Software Engineer, Google / Chromium OS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives