lkml.org 
[lkml]   [2014]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Date
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---

Please let me know if there are any objections against pushing this through
the linux-pm tree.

---
sound/soc/intel/sst-haswell-pcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-pm/sound/soc/intel/sst-haswell-pcm.c
===================================================================
--- linux-pm.orig/sound/soc/intel/sst-haswell-pcm.c
+++ linux-pm/sound/soc/intel/sst-haswell-pcm.c
@@ -998,7 +998,7 @@ static int hsw_pcm_dev_remove(struct pla
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
#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)
{


\
 
 \ /
  Last update: 2014-12-19 03:21    [W:1.104 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site