On 23:49 Mon 28 Oct , Laurent Pinchart wrote:
> Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> clk_disable_unprepare() to get ready for the migration to the common
> clock framework.
>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
> Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Bset Regards,
J.
> Cc: linux-fbdev@xxxxxxxxxxxxxxx
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/video/sh_mobile_hdmi.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
> index bfe4728..190145e 100644
> --- a/drivers/video/sh_mobile_hdmi.c
> +++ b/drivers/video/sh_mobile_hdmi.c
> @@ -1326,7 +1326,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
> goto erate;
> }
>
> - ret = clk_enable(hdmi->hdmi_clk);
> + ret = clk_prepare_enable(hdmi->hdmi_clk);
> if (ret < 0) {
> dev_err(hdmi->dev, "Cannot enable clock: %d\n", ret);
> goto erate;
> @@ -1404,7 +1404,7 @@ emap_htop1:
> emap:
> release_mem_region(res->start, resource_size(res));
> ereqreg:
> - clk_disable(hdmi->hdmi_clk);
> + clk_disable_unprepare(hdmi->hdmi_clk);
> erate:
> clk_put(hdmi->hdmi_clk);
> egetclk:
> @@ -1427,7 +1427,7 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
> cancel_delayed_work_sync(&hdmi->edid_work);
> pm_runtime_put(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
> - clk_disable(hdmi->hdmi_clk);
> + clk_disable_unprepare(hdmi->hdmi_clk);
> clk_put(hdmi->hdmi_clk);
> if (hdmi->htop1)
> iounmap(hdmi->htop1);
> --
> 1.8.1.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
