From: Inki Dae <inki.dae@samsung.com>
Date: Thu, 25 Apr 2013 10:21:42 +0000 (+0900)
Subject: Revert "drm/exynos: prepare FIMD clocks"
X-Git-Tag: v3.10-rc1~110^2~16^2~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=baa88c8313bfdb5086220cbd962a93617ee85a91;p=~emulex%2Finfiniband.git

Revert "drm/exynos: prepare FIMD clocks"

This reverts commit b4e3a3e844a0e33cf106a1c9f27ff93340c37640.
---

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 15e58f5abe0..4073430e22c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -949,16 +949,6 @@ static int fimd_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = clk_prepare(ctx->bus_clk);
-	if (ret < 0)
-		return ret;
-
-	ret = clk_prepare(ctx->lcd_clk);
-	if  (ret < 0) {
-		clk_unprepare(ctx->bus_clk);
-		return ret;
-	}
-
 	ctx->vidcon0 = pdata->vidcon0;
 	ctx->vidcon1 = pdata->vidcon1;
 	ctx->default_win = pdata->default_win;
@@ -1006,8 +996,8 @@ static int fimd_remove(struct platform_device *pdev)
 	if (ctx->suspended)
 		goto out;
 
-	clk_unprepare(ctx->lcd_clk);
-	clk_unprepare(ctx->bus_clk);
+	clk_disable(ctx->lcd_clk);
+	clk_disable(ctx->bus_clk);
 
 	pm_runtime_set_suspended(dev);
 	pm_runtime_put_sync(dev);