media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

The alternative of CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME may be
replaced with CONFIG_PM too.

Make these changes everywhere under drivers/media/.

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Kamil Debski <k.debski@samsung.com>
Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index ced4760..5f0cd5c 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1980,7 +1980,7 @@ static int coda_probe(struct platform_device *pdev)
 
        /*
         * Start activated so we can directly call coda_hw_init in
-        * coda_fw_callback regardless of whether CONFIG_PM_RUNTIME is
+        * coda_fw_callback regardless of whether CONFIG_PM is
         * enabled or whether the device is associated with a PM domain.
         */
        pm_runtime_get_noresume(&pdev->dev);
@@ -2013,7 +2013,7 @@ static int coda_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int coda_runtime_resume(struct device *dev)
 {
        struct coda_dev *cdev = dev_get_drvdata(dev);

diff --cc drivers/media/platform/exynos4-is/fimc-core.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is-i2c.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-lite.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/mipi-csis.c
Simple merge

diff --cc drivers/media/platform/s5p-jpeg/jpeg-core.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc.c
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
Simple merge