Skip to content

Commit

Permalink
spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Dec 19, 2014
1 parent c0f486f commit 47164fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/spi/spi-img-spfi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/spi/spi-meson-spifc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down

0 comments on commit 47164fd

Please sign in to comment.