Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e243c7c1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarKamil Debski <k.debski@samsung.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent dc5686e4

drivers/media/platform/coda/coda-common.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/exynos4-is/fimc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ err: 
	return -ENXIO;

}



#if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)

#ifdef CONFIG_PM

static int fimc_m2m_suspend(struct fimc_dev *fimc)

{

	unsigned long flags;
@@ -871,7 +871,7 @@ static int fimc_m2m_resume(struct fimc_dev *fimc) 


	return 0;

}

#endif /* CONFIG_PM_RUNTIME || CONFIG_PM_SLEEP */

#endif /* CONFIG_PM */



static const struct of_device_id fimc_of_match[];
@@ -1039,7 +1039,7 @@ err_sclk: 
	return ret;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int fimc_runtime_resume(struct device *dev)

{

	struct fimc_dev *fimc =	dev_get_drvdata(dev);

drivers/media/platform/exynos4-is/fimc-is-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int fimc_is_i2c_remove(struct platform_device *pdev) 
	return 0;

}



#if defined(CONFIG_PM_RUNTIME) || defined(CONFIG_PM_SLEEP)

#ifdef CONFIG_PM

static int fimc_is_i2c_runtime_suspend(struct device *dev)

{

	struct fimc_is_i2c *isp_i2c = dev_get_drvdata(dev);

drivers/media/platform/exynos4-is/fimc-lite.c

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ err_clk_put: 
	return ret;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int fimc_lite_runtime_resume(struct device *dev)

{

	struct fimc_lite *fimc = dev_get_drvdata(dev);

drivers/media/platform/exynos4-is/mipi-csis.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ static int s5pcsis_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int s5pcsis_runtime_suspend(struct device *dev)

{

	return s5pcsis_pm_suspend(dev, true);