linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
@ 2014-12-04  1:17 Rafael J. Wysocki
  2014-12-13  1:36 ` [Resend][PATCH] " Rafael J. Wysocki
  0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2014-12-04  1:17 UTC (permalink / raw)
  To: linux-wireless
  Cc: Lauro Ramos Venancio, Aloisio Almeida Jr, Samuel Ortiz,
	Linux Kernel Mailing List, Linux PM list

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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 drivers/nfc/trf7970a.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
PM_SLEEP is selected) which is only in linux-next at the moment (via the
linux-pm tree).

Please let me know if it is OK to take this one into linux-pm.

---
 drivers/nfc/trf7970a.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/nfc/trf7970a.c
===================================================================
--- linux-pm.orig/drivers/nfc/trf7970a.c
+++ linux-pm/drivers/nfc/trf7970a.c
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device
 }
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int trf7970a_pm_runtime_suspend(struct device *dev)
 {
 	struct spi_device *spi = container_of(dev, struct spi_device, dev);


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [Resend][PATCH] NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  2014-12-04  1:17 [PATCH] NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-13  1:36 ` Rafael J. Wysocki
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2014-12-13  1:36 UTC (permalink / raw)
  To: linux-wireless
  Cc: Lauro Ramos Venancio, Aloisio Almeida Jr, Samuel Ortiz,
	Linux Kernel Mailing List, Linux PM list

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

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 drivers/nfc/trf7970a.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Please let me know if there are any objections against this.  If not, I'll
take it through the linux-pm tree, as I'm going to remove CONFIG_PM_RUNTIME
entirely shortly.

---
 drivers/nfc/trf7970a.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-pm/drivers/nfc/trf7970a.c
===================================================================
--- linux-pm.orig/drivers/nfc/trf7970a.c
+++ linux-pm/drivers/nfc/trf7970a.c
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device
 }
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int trf7970a_pm_runtime_suspend(struct device *dev)
 {
 	struct spi_device *spi = container_of(dev, struct spi_device, dev);


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-12-13  1:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-04  1:17 [PATCH] NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-13  1:36 ` [Resend][PATCH] " Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).