mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM list <linux-pm@vger.kernel.org>,
	Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Kevin Hilman <khilman@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 2/4] sound: sst-haswell-pcm: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Date: Fri, 19 Dec 2014 02:51:38 +0100	[thread overview]
Message-ID: <26780431.Uk4uOmhdgG@vostro.rjw.lan> (raw)
In-Reply-To: <472992175.g1ArEYGFPo@vostro.rjw.lan>

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


  parent reply	other threads:[~2014-12-19  1:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-19  1:42 [PATCH 0/4] PM: Elimination of CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19  1:49 ` [PATCH 1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-19 11:39   ` Mark Brown
2014-12-19  1:51 ` Rafael J. Wysocki [this message]
2014-12-19 11:41   ` [PATCH 2/4] sound: sst-haswell-pcm: " Mark Brown
2014-12-19  1:55 ` [PATCH 3/4] tty: 8250_omap: " Rafael J. Wysocki
2014-12-19  1:57   ` Greg Kroah-Hartman
2014-12-19  2:23     ` Rafael J. Wysocki
2014-12-19  2:03 ` [PATCH 4/4] PM: Eliminate CONFIG_PM_RUNTIME Rafael J. Wysocki
2014-12-19  7:44   ` Ulf Hansson
2014-12-19  8:13   ` Geert Uytterhoeven
2014-12-19 21:41     ` Rafael J. Wysocki
2014-12-19 21:49       ` Kevin Hilman
2014-12-19 22:25         ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=26780431.Uk4uOmhdgG@vostro.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=broonie@kernel.org \
    --cc=khilman@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=tiwai@suse.de \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®