[media] exynos4-is: use devm_of_platform_populate()
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>
Mon, 29 May 2017 15:46:03 +0000 (12:46 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 13 Jun 2017 17:19:54 +0000 (14:19 -0300)
Usage of devm_of_platform_populate() simplify driver code
and save somes lines

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/exynos4-is/fimc-is.c

index 7f92144..340d906 100644 (file)
@@ -854,7 +854,7 @@ static int fimc_is_probe(struct platform_device *pdev)
 
        vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32));
 
-       ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
+       ret = devm_of_platform_populate(dev);
        if (ret < 0)
                goto err_pm;
 
@@ -864,7 +864,7 @@ static int fimc_is_probe(struct platform_device *pdev)
         */
        ret = fimc_is_register_subdevs(is);
        if (ret < 0)
-               goto err_of_dep;
+               goto err_pm;
 
        ret = fimc_is_debugfs_create(is);
        if (ret < 0)
@@ -883,8 +883,6 @@ err_dfs:
        fimc_is_debugfs_remove(is);
 err_sd:
        fimc_is_unregister_subdevs(is);
-err_of_dep:
-       of_platform_depopulate(dev);
 err_pm:
        if (!pm_runtime_enabled(dev))
                fimc_is_runtime_suspend(dev);
@@ -946,7 +944,6 @@ static int fimc_is_remove(struct platform_device *pdev)
        if (!pm_runtime_status_suspended(dev))
                fimc_is_runtime_suspend(dev);
        free_irq(is->irq, is);
-       of_platform_depopulate(dev);
        fimc_is_unregister_subdevs(is);
        vb2_dma_contig_clear_max_seg_size(dev);
        fimc_is_put_clocks(is);