diff mbox

[1/4] spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM

Message ID 6486956.sOFTSHEqBe@vostro.rjw.lan
State New, archived
Headers show

Commit Message

Rafael J. Wysocki Dec. 19, 2014, 1:49 a.m. UTC
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

A couple of new CONFIG_PM_RUNTIME users have been added recently
in the SPI subsystem.

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 everywhere under
drivers/spi/ (again).

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.

---
 drivers/spi/spi-img-spfi.c    |    4 ++--
 drivers/spi/spi-meson-spifc.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Mark Brown Dec. 19, 2014, 11:39 a.m. UTC | #1
On Fri, Dec 19, 2014 at 02:49:26AM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> A couple of new CONFIG_PM_RUNTIME users have been added recently
> in the SPI subsystem.

Acked-by: Mark Brown <broonie@kernel.org>
diff mbox

Patch

Index: linux-pm/drivers/spi/spi-meson-spifc.c
===================================================================
--- linux-pm.orig/drivers/spi/spi-meson-spifc.c
+++ linux-pm/drivers/spi/spi-meson-spifc.c
@@ -413,7 +413,7 @@  static int meson_spifc_resume(struct dev
 }
 #endif /* CONFIG_PM_SLEEP */
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int meson_spifc_runtime_suspend(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
@@ -431,7 +431,7 @@  static int meson_spifc_runtime_resume(st
 
 	return clk_prepare_enable(spifc->clk);
 }
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 
 static const struct dev_pm_ops meson_spifc_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)
Index: linux-pm/drivers/spi/spi-img-spfi.c
===================================================================
--- linux-pm.orig/drivers/spi/spi-img-spfi.c
+++ linux-pm/drivers/spi/spi-img-spfi.c
@@ -663,7 +663,7 @@  static int img_spfi_remove(struct platfo
 	return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int img_spfi_runtime_suspend(struct device *dev)
 {
 	struct spi_master *master = dev_get_drvdata(dev);
@@ -692,7 +692,7 @@  static int img_spfi_runtime_resume(struc
 
 	return 0;
 }
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_PM_SLEEP
 static int img_spfi_suspend(struct device *dev)