UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Sachin Kamat 2012-11-26 03:20:21 -03:00 committed by Mauro Carvalho Chehab
parent 21ae96d397
commit e2732ae5dd
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/platform/exynos-gsc/gsc-core.c
View File

@ -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)