diff mbox

[6/6,media] s5p-mfc: Use devm_clk_get APIs

Message ID 1353671443-2978-7-git-send-email-sachin.kamat@linaro.org
State Deferred
Headers show

Commit Message

Sachin Kamat Nov. 23, 2012, 11:50 a.m. UTC 
devm_clk_get() is device managed function and makes error handling
and exit code a bit simpler.

Cc: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-mfc/s5p_mfc_pm.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

Comments

Kamil Debski Nov. 28, 2012, 10:13 a.m. UTC | #1 
Hi Sachin,

The comments from Sylwester also apply to the patches you have sent to MFC
and G2D.

I don't see the benefit of switching to devm_clk_get(), it does some
allocations and hence uses more resources. Leaving that aside there is no
support for devm_clk_prepare and I would rather wait until it is included in
the kernel.

Best wishes,
diff mbox

Patch

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
index 2895333..4864d93 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
@@ -37,7 +37,7 @@  int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
 
 	pm = &dev->pm;
 	p_dev = dev;
-	pm->clock_gate = clk_get(&dev->plat_dev->dev, MFC_GATE_CLK_NAME);
+	pm->clock_gate = devm_clk_get(&dev->plat_dev->dev, MFC_GATE_CLK_NAME);
 	if (IS_ERR(pm->clock_gate)) {
 		mfc_err("Failed to get clock-gating control\n");
 		ret = PTR_ERR(pm->clock_gate);
@@ -47,10 +47,10 @@  int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
 	ret = clk_prepare(pm->clock_gate);
 	if (ret) {
 		mfc_err("Failed to preapre clock-gating control\n");
-		goto err_p_ip_clk;
+		goto err_g_ip_clk;
 	}
 
-	pm->clock = clk_get(&dev->plat_dev->dev, dev->variant->mclk_name);
+	pm->clock = devm_clk_get(&dev->plat_dev->dev, dev->variant->mclk_name);
 	if (IS_ERR(pm->clock)) {
 		mfc_err("Failed to get MFC clock\n");
 		ret = PTR_ERR(pm->clock);
@@ -60,7 +60,7 @@  int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
 	ret = clk_prepare(pm->clock);
 	if (ret) {
 		mfc_err("Failed to prepare MFC clock\n");
-		goto err_p_ip_clk_2;
+		goto err_g_ip_clk_2;
 	}
 
 	atomic_set(&pm->power, 0);
@@ -72,12 +72,8 @@  int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)
 	atomic_set(&clk_ref, 0);
 #endif
 	return 0;
-err_p_ip_clk_2:
-	clk_put(pm->clock);
 err_g_ip_clk_2:
 	clk_unprepare(pm->clock_gate);
-err_p_ip_clk:
-	clk_put(pm->clock_gate);
 err_g_ip_clk:
 	return ret;
 }
@@ -85,9 +81,7 @@  err_g_ip_clk:
 void s5p_mfc_final_pm(struct s5p_mfc_dev *dev)
 {
 	clk_unprepare(pm->clock_gate);
-	clk_put(pm->clock_gate);
 	clk_unprepare(pm->clock);
-	clk_put(pm->clock);
 #ifdef CONFIG_PM_RUNTIME
 	pm_runtime_disable(pm->device);
 #endif