Skip to content

Commit

Permalink
drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_g…
Browse files Browse the repository at this point in the history
…sc.c

devm_* APIs are device managed and get freed automatically when the
device detaches. Thus explicit freeing is not needed. This saves some
code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
  • Loading branch information
Sachin Kamat authored and Inki Dae committed Jan 4, 2013
1 parent af8cd94 commit cfdee8f
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/gpu/drm/exynos/exynos_drm_gsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1687,8 +1687,7 @@ static int __devinit gsc_probe(struct platform_device *pdev)
ctx->gsc_clk = clk_get(dev, "gscl");
if (IS_ERR(ctx->gsc_clk)) {
dev_err(dev, "failed to get gsc clock.\n");
ret = PTR_ERR(ctx->gsc_clk);
goto err_ctx;
return PTR_ERR(ctx->gsc_clk);
}

/* resource memory */
Expand All @@ -1711,15 +1710,15 @@ static int __devinit gsc_probe(struct platform_device *pdev)
if (!res) {
dev_err(dev, "failed to request irq resource.\n");
ret = -ENOENT;
goto err_get_regs;
goto err_clk;
}

ctx->irq = res->start;
ret = request_threaded_irq(ctx->irq, NULL, gsc_irq_handler,
IRQF_ONESHOT, "drm_gsc", ctx);
if (ret < 0) {
dev_err(dev, "failed to request irq.\n");
goto err_get_regs;
goto err_clk;
}

/* context initailization */
Expand Down Expand Up @@ -1763,12 +1762,8 @@ static int __devinit gsc_probe(struct platform_device *pdev)
pm_runtime_disable(dev);
err_get_irq:
free_irq(ctx->irq, ctx);
err_get_regs:
devm_iounmap(dev, ctx->regs);
err_clk:
clk_put(ctx->gsc_clk);
err_ctx:
devm_kfree(dev, ctx);
return ret;
}

Expand All @@ -1786,12 +1781,8 @@ static int __devexit gsc_remove(struct platform_device *pdev)
pm_runtime_disable(dev);

free_irq(ctx->irq, ctx);
devm_iounmap(dev, ctx->regs);

clk_put(ctx->gsc_clk);

devm_kfree(dev, ctx);

return 0;
}

Expand Down

0 comments on commit cfdee8f

Please sign in to comment.