Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d00affb1 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare 



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@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 8623ec22

drivers/video/sh_mobile_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -1425,7 +1425,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);