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

drm/exynos: Use devm_clk_get in exynos_drm_gsc.c 

This eliminates the need for explicit clk_put and makes the
cleanup and exit path code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Sachin Kamat 2012-12-24 14:03:51 +05:30 committed by Inki Dae
parent a8527cf5c3
commit 5cbd419cc5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/exynos/exynos_drm_gsc.c
View File

@ -1684,7 +1684,7 @@ static int __devinit gsc_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
/* clock control */ /* clock control */
ctx->gsc_clk = clk_get(dev, "gscl"); ctx->gsc_clk = devm_clk_get(dev, "gscl");
if (IS_ERR(ctx->gsc_clk)) { if (IS_ERR(ctx->gsc_clk)) {
dev_err(dev, "failed to get gsc clock.\n"); dev_err(dev, "failed to get gsc clock.\n");
return PTR_ERR(ctx->gsc_clk); return PTR_ERR(ctx->gsc_clk);
@ -1695,16 +1695,14 @@ static int __devinit gsc_probe(struct platform_device *pdev)
ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res); ctx->regs = devm_request_and_ioremap(dev, ctx->regs_res);
if (!ctx->regs) { if (!ctx->regs) {
dev_err(dev, "failed to map registers.\n"); dev_err(dev, "failed to map registers.\n");
ret = -ENXIO; return -ENXIO;
goto err_clk;
} }
/* resource irq */ /* resource irq */
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!res) { if (!res) {
dev_err(dev, "failed to request irq resource.\n"); dev_err(dev, "failed to request irq resource.\n");
ret = -ENOENT; return -ENOENT;
goto err_clk;
} }
ctx->irq = res->start; ctx->irq = res->start;
@ -1712,7 +1710,7 @@ static int __devinit gsc_probe(struct platform_device *pdev)
IRQF_ONESHOT, "drm_gsc", ctx); IRQF_ONESHOT, "drm_gsc", ctx);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "failed to request irq.\n"); dev_err(dev, "failed to request irq.\n");
goto err_clk; return ret;
} }
/* context initailization */ /* context initailization */
@ -1756,8 +1754,6 @@ err_ippdrv_register:
pm_runtime_disable(dev); pm_runtime_disable(dev);
err_get_irq: err_get_irq:
free_irq(ctx->irq, ctx); free_irq(ctx->irq, ctx);
err_clk:
clk_put(ctx->gsc_clk);
return ret; return ret;
} }
@ -1775,7 +1771,6 @@ static int __devexit gsc_remove(struct platform_device *pdev)
pm_runtime_disable(dev); pm_runtime_disable(dev);
free_irq(ctx->irq, ctx); free_irq(ctx->irq, ctx);
clk_put(ctx->gsc_clk);
return 0; return 0;
} }