sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM

rafaeljw · rafaeljw · commit 45544c884e16 · 2014-12-19T15:26:46.000+01:00
The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME. However, after commit b2b49cc (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. Replace CONFIG_PM_RUNTIME with CONFIG_PM in sound/soc/intel/sst-haswell-pcm.c. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 
 static int hsw_pcm_runtime_idle(struct device *dev)
 {
@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct device *dev)
 #define hsw_pcm_runtime_resume		NULL
 #endif
 
-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME)
+#ifdef CONFIG_PM
 
 static void hsw_pcm_complete(struct device *dev)
 {

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct platform_device *pdev)`
`998`	`998`	`return 0;`
`999`	`999`	`}`
`1000`	`1000`
`1001`		`-#ifdef CONFIG_PM_RUNTIME`
	`1001`	`+#ifdef CONFIG_PM`
`1002`	`1002`
`1003`	`1003`	`static int hsw_pcm_runtime_idle(struct device *dev)`
`1004`	`1004`	`{`
`@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct device *dev)`
`1057`	`1057`	`#define hsw_pcm_runtime_resume NULL`
`1058`	`1058`	`#endif`
`1059`	`1059`
`1060`		`-#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME)`
	`1060`	`+#ifdef CONFIG_PM`
`1061`	`1061`
`1062`	`1062`	`static void hsw_pcm_complete(struct device *dev)`
`1063`	`1063`	`{`