Skip to content

Commit

Permalink
sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Dec 19, 2014
1 parent 47164fd commit 45544c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/soc/intel/sst-haswell-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 45544c8

Please sign in to comment.