aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-19 09:26:46 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-19 09:26:46 -0500
commit45544c884e16901e8c3df9ba0da18fd41f766b93 (patch)
tree3469ce33ce9dd0a0d5cc68e840353db28f4706fc /sound
parent47164fdb3bdb59bb42a4b68e273385f9a1cdd1f6 (diff)
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 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. 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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/sst-haswell-pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c
index b8a782c0d4cd..619525200705 100644
--- 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)
998 return 0; 998 return 0;
999} 999}
1000 1000
1001#ifdef CONFIG_PM_RUNTIME 1001#ifdef CONFIG_PM
1002 1002
1003static int hsw_pcm_runtime_idle(struct device *dev) 1003static int hsw_pcm_runtime_idle(struct device *dev)
1004{ 1004{
@@ -1057,7 +1057,7 @@ static int hsw_pcm_runtime_resume(struct device *dev)
1057#define hsw_pcm_runtime_resume NULL 1057#define hsw_pcm_runtime_resume NULL
1058#endif 1058#endif
1059 1059
1060#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_RUNTIME) 1060#ifdef CONFIG_PM
1061 1061
1062static void hsw_pcm_complete(struct device *dev) 1062static void hsw_pcm_complete(struct device *dev)
1063{ 1063{