diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 00:41:15 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-13 00:41:15 +0100 |
| commit | ec83305032d9b29e439a9e56ca3644f97f638565 (patch) | |
| tree | c09c6aaac282d7a1b481aafc704339e9e7764d12 /drivers/spi/spi-qup.c | |
| parent | 92a578b064d0227a3a7fbbdb9e29dbab7f8d400e (diff) | |
| download | op-kernel-dev-ec83305032d9b29e439a9e56ca3644f97f638565.zip op-kernel-dev-ec83305032d9b29e439a9e56ca3644f97f638565.tar.gz | |
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 9f83d29..3d0ab0a 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -646,7 +646,7 @@ error: return ret; } -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int spi_qup_pm_suspend_runtime(struct device *device) { struct spi_master *master = dev_get_drvdata(device); @@ -672,7 +672,7 @@ static int spi_qup_pm_resume_runtime(struct device *device) writel_relaxed(config, controller->base + QUP_CONFIG); return 0; } -#endif /* CONFIG_PM_RUNTIME */ +#endif /* CONFIG_PM */ #ifdef CONFIG_PM_SLEEP static int spi_qup_suspend(struct device *device) |
