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;
 
         */
        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)
        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);
        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);