diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:41:15 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-12 18:41:15 -0500 |
commit | ec83305032d9b29e439a9e56ca3644f97f638565 (patch) | |
tree | c09c6aaac282d7a1b481aafc704339e9e7764d12 /drivers/spi/spi-qup.c | |
parent | 92a578b064d0227a3a7fbbdb9e29dbab7f8d400e (diff) |
spi: 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 everywhere under
drivers/spi/.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-qup.c')
-rw-r--r-- | drivers/spi/spi-qup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 9f83d2950748..3d0ab0a00466 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c | |||
@@ -646,7 +646,7 @@ error: | |||
646 | return ret; | 646 | return ret; |
647 | } | 647 | } |
648 | 648 | ||
649 | #ifdef CONFIG_PM_RUNTIME | 649 | #ifdef CONFIG_PM |
650 | static int spi_qup_pm_suspend_runtime(struct device *device) | 650 | static int spi_qup_pm_suspend_runtime(struct device *device) |
651 | { | 651 | { |
652 | struct spi_master *master = dev_get_drvdata(device); | 652 | struct spi_master *master = dev_get_drvdata(device); |
@@ -672,7 +672,7 @@ static int spi_qup_pm_resume_runtime(struct device *device) | |||
672 | writel_relaxed(config, controller->base + QUP_CONFIG); | 672 | writel_relaxed(config, controller->base + QUP_CONFIG); |
673 | return 0; | 673 | return 0; |
674 | } | 674 | } |
675 | #endif /* CONFIG_PM_RUNTIME */ | 675 | #endif /* CONFIG_PM */ |
676 | 676 | ||
677 | #ifdef CONFIG_PM_SLEEP | 677 | #ifdef CONFIG_PM_SLEEP |
678 | static int spi_qup_suspend(struct device *device) | 678 | static int spi_qup_suspend(struct device *device) |