From: Rafael J. Wysocki Date: Thu, 4 Dec 2014 00:10:10 +0000 (+0100) Subject: media / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM X-Git-Tag: omap-for-v3.20/drop-legacy-3517~133^2^2~7 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e243c7c1a41476d505ee77481c08ff32470edbeb;p=pandora-kernel.git 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 Acked-by: Philipp Zabel Acked-by: Kamil Debski Acked-by: Mauro Carvalho Chehab Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index ced47609f5ef..5f0cd5cafea2 100644 --- 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); Reading git-diff-tree failed