From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 26 Nov 2012 06:20:21 +0000 (-0300)
Subject: [media] exynos-gsc: Use devm_clk_get()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2732ae5dd9c765732dda6b7120eb74896562c22;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[media] exynos-gsc: Use devm_clk_get()

devm_clk_get() is a device managed function and makes error handling
a bit simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index c8b82c006bd0..0c22ad570500 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1002,11 +1002,8 @@ static void *gsc_get_drv_data(struct platform_device *pdev)
 
 static void gsc_clk_put(struct gsc_dev *gsc)
 {
-	if (!IS_ERR(gsc->clock)) {
+	if (!IS_ERR(gsc->clock))
 		clk_unprepare(gsc->clock);
-		clk_put(gsc->clock);
-		gsc->clock = NULL;
-	}
 }
 
 static int gsc_clk_get(struct gsc_dev *gsc)
@@ -1015,28 +1012,22 @@ static int gsc_clk_get(struct gsc_dev *gsc)
 
 	dev_dbg(&gsc->pdev->dev, "gsc_clk_get Called\n");
 
-	gsc->clock = clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);
+	gsc->clock = devm_clk_get(&gsc->pdev->dev, GSC_CLOCK_GATE_NAME);
 	if (IS_ERR(gsc->clock)) {
 		dev_err(&gsc->pdev->dev, "failed to get clock~~~: %s\n",
 			GSC_CLOCK_GATE_NAME);
-		goto err_clk_get;
+		return PTR_ERR(gsc->clock);
 	}
 
 	ret = clk_prepare(gsc->clock);
 	if (ret < 0) {
 		dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
 			GSC_CLOCK_GATE_NAME);
-		clk_put(gsc->clock);
 		gsc->clock = ERR_PTR(-EINVAL);
-		goto err_clk_prepare;
+		return ret;
 	}
 
 	return 0;
-
-err_clk_prepare:
-	gsc_clk_put(gsc);
-err_clk_get:
-	return -ENXIO;
 }
 
 static int gsc_m2m_suspend(struct gsc_dev *gsc)