Commit 47164fdb3bdb59bb42a4b68e273385f9a1cdd1f6
1 parent
c0f486fde3
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
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> Acked-by: Mark Brown <broonie@kernel.org>
Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff
drivers/spi/spi-img-spfi.c
| ... | ... | @@ -663,7 +663,7 @@ |
| 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 @@ |
| 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) |
drivers/spi/spi-meson-spifc.c
| ... | ... | @@ -413,7 +413,7 @@ |
| 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 @@ |
| 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) |