From 314aa8640ad47bc4e31fb866d0c964d646280f42 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Thu, 12 Sep 2013 18:48:04 +0200 Subject: [PATCH] exynos4-is: Do not unnecessarily activate fimc devices in probe() There is no use of temporarily activating the device in probe() so remove the pm_runtime_get_sync(), pm_runtime_put() calls. Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/exynos4-is/fimc-core.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c index 5c0f438..6823ce0 100644 --- a/drivers/media/platform/exynos4-is/fimc-core.c +++ b/drivers/media/platform/exynos4-is/fimc-core.c @@ -1029,23 +1029,18 @@ static int fimc_probe(struct platform_device *pdev) goto err_clk; platform_set_drvdata(pdev, fimc); - pm_runtime_enable(dev); - ret = pm_runtime_get_sync(dev); - if (ret < 0) - goto err_sd; + /* Initialize contiguous memory allocator */ fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev); if (IS_ERR(fimc->alloc_ctx)) { ret = PTR_ERR(fimc->alloc_ctx); - goto err_pm; + goto err_sd; } - dev_dbg(dev, "FIMC.%d registered successfully\n", fimc->id); + pm_runtime_enable(dev); - pm_runtime_put(dev); + dev_dbg(dev, "FIMC.%d registered successfully\n", fimc->id); return 0; -err_pm: - pm_runtime_put(dev); err_sd: fimc_unregister_capture_subdev(fimc); err_clk: -- 2.7.4