Commit 45544c88 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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

The sst-haswell-pcm driver is a new user of CONFIG_PM_RUNTIME.

However, 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.

Replace CONFIG_PM_RUNTIME with CONFIG_PM in
sound/soc/intel/sst-haswell-pcm.c.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
parent 47164fdb
...@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct platform_device *pdev) ...@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int hsw_pcm_runtime_idle(struct device *dev) static int hsw_pcm_runtime_idle(struct device *dev)
{ {
...@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct device *dev) ...@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct device *dev)
#define hsw_pcm_runtime_resume NULL #define hsw_pcm_runtime_resume NULL
#endif #endif
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME) #ifdef CONFIG_PM
static void hsw_pcm_complete(struct device *dev) static void hsw_pcm_complete(struct device *dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment