[media] media/platform: convert drivers to use the new vb2_queue dev field

[linux.git] / drivers / media / platform / exynos4-is / fimc-core.c

diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index 368f44f24d4c808db780a6b22b0442301240e820..8f89ca21b63193458e9e70d9c4e7ba0b76d20c86 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -1018,20 +1018,11 @@ static int fimc_probe(struct platform_device *pdev)
                        goto err_sd;
        }
 
-       /* Initialize contiguous memory allocator */
        vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32));
-       fimc->alloc_ctx = vb2_dma_contig_init_ctx(dev);
-       if (IS_ERR(fimc->alloc_ctx)) {
-               ret = PTR_ERR(fimc->alloc_ctx);
-               goto err_gclk;
-       }
 
        dev_dbg(dev, "FIMC.%d registered successfully\n", fimc->id);
        return 0;
 
-err_gclk:
-       if (!pm_runtime_enabled(dev))
-               clk_disable(fimc->clock[CLK_GATE]);
 err_sd:
        fimc_unregister_capture_subdev(fimc);
 err_sclk:
@@ -1124,7 +1115,6 @@ static int fimc_remove(struct platform_device *pdev)
        pm_runtime_set_suspended(&pdev->dev);
 
        fimc_unregister_capture_subdev(fimc);
-       vb2_dma_contig_cleanup_ctx(fimc->alloc_ctx);
        vb2_dma_contig_clear_max_seg_size(&pdev->dev);
 
        clk_disable(fimc->clock[CLK_BUS]);