spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM

rafaeljw · rafaeljw · commit 47164fdb3bdb · 2014-12-19T15:25:31.000+01:00
A couple of new CONFIG_PM_RUNTIME users have been added recently in the SPI subsystem. 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 everywhere under drivers/spi/ (again). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Mark Brown <broonie@kernel.org>
diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c
@@ -663,7 +663,7 @@ static int img_spfi_remove(struct platform_device *pdev)
 	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(struct device *dev)
 
 	return 0;
 }
-#endif /* CONFIG_PM_RUNTIME */
+#endif /* CONFIG_PM */
 
 #ifdef CONFIG_PM_SLEEP
 static int img_spfi_suspend(struct device *dev)
diff --git a/drivers/spi/spi-meson-spifc.c b/drivers/spi/spi-meson-spifc.c
@@ -413,7 +413,7 @@ static int meson_spifc_resume(struct device *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(struct device *dev)
 
 	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)

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ static int img_spfi_remove(struct platform_device *pdev)`
`663`	`663`	`return 0;`
`664`	`664`	`}`
`665`	`665`
`666`		`-#ifdef CONFIG_PM_RUNTIME`
	`666`	`+#ifdef CONFIG_PM`
`667`	`667`	`static int img_spfi_runtime_suspend(struct device *dev)`
`668`	`668`	`{`
`669`	`669`	`struct spi_master *master = dev_get_drvdata(dev);`
`@@ -692,7 +692,7 @@ static int img_spfi_runtime_resume(struct device *dev)`
`692`	`692`
`693`	`693`	`return 0;`
`694`	`694`	`}`
`695`		`-#endif /* CONFIG_PM_RUNTIME */`
	`695`	`+#endif /* CONFIG_PM */`
`696`	`696`
`697`	`697`	`#ifdef CONFIG_PM_SLEEP`
`698`	`698`	`static int img_spfi_suspend(struct device *dev)`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ static int meson_spifc_resume(struct device *dev)`
`413`	`413`	`}`
`414`	`414`	`#endif /* CONFIG_PM_SLEEP */`
`415`	`415`
`416`		`-#ifdef CONFIG_PM_RUNTIME`
	`416`	`+#ifdef CONFIG_PM`
`417`	`417`	`static int meson_spifc_runtime_suspend(struct device *dev)`
`418`	`418`	`{`
`419`	`419`	`struct spi_master *master = dev_get_drvdata(dev);`
`@@ -431,7 +431,7 @@ static int meson_spifc_runtime_resume(struct device *dev)`
`431`	`431`
`432`	`432`	`return clk_prepare_enable(spifc->clk);`
`433`	`433`	`}`
`434`		`-#endif /* CONFIG_PM_RUNTIME */`
	`434`	`+#endif /* CONFIG_PM */`
`435`	`435`
`436`	`436`	`static const struct dev_pm_ops meson_spifc_pm_ops = {`
`437`	`437`	`SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)`