Commit 45544c88 authored Dec 19, 2014 by 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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>

parent 47164fdb

sound/soc/intel/sst-haswell-pcm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)
		{