evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM

Browse source 
After commit b2b49ccbdd (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>
This commit is contained in:
Rafael J. Wysocki 2014-12-13 00:41:15 +01:00
parent 92a578b064
commit ec83305032
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/spi/spi-coldfire-qspi.c
View file

@ -491,7 +491,7 @@ static int mcfqspi_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int mcfqspi_runtime_suspend(struct device *dev) static int mcfqspi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);

2
drivers/spi/spi-orion.c
View file

@ -523,7 +523,7 @@ static int orion_spi_remove(struct platform_device *pdev)
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int orion_spi_runtime_suspend(struct device *dev) static int orion_spi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);

2
drivers/spi/spi-pxa2xx.c
View file

@ -1307,7 +1307,7 @@ static int pxa2xx_spi_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int pxa2xx_spi_runtime_suspend(struct device *dev) static int pxa2xx_spi_runtime_suspend(struct device *dev)
{ {
struct driver_data *drv_data = dev_get_drvdata(dev); struct driver_data *drv_data = dev_get_drvdata(dev);

4
drivers/spi/spi-qup.c
View file

@ -646,7 +646,7 @@ error:
return ret; return ret;
} }
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int spi_qup_pm_suspend_runtime(struct device *device) static int spi_qup_pm_suspend_runtime(struct device *device)
{ {
struct spi_master *master = dev_get_drvdata(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); writel_relaxed(config, controller->base + QUP_CONFIG);
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int spi_qup_suspend(struct device *device) static int spi_qup_suspend(struct device *device)

4
drivers/spi/spi-rockchip.c
View file

@ -801,7 +801,7 @@ static int rockchip_spi_resume(struct device *dev)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int rockchip_spi_runtime_suspend(struct device *dev) static int rockchip_spi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
@ -829,7 +829,7 @@ static int rockchip_spi_runtime_resume(struct device *dev)
return ret; return ret;
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
static const struct dev_pm_ops rockchip_spi_pm = { static const struct dev_pm_ops rockchip_spi_pm = {
SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume) SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume)

4
drivers/spi/spi-s3c64xx.c
View file

@ -1266,7 +1266,7 @@ static int s3c64xx_spi_resume(struct device *dev)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int s3c64xx_spi_runtime_suspend(struct device *dev) static int s3c64xx_spi_runtime_suspend(struct device *dev)
{ {
struct spi_master *master = dev_get_drvdata(dev); struct spi_master *master = dev_get_drvdata(dev);
@ -1296,7 +1296,7 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
static const struct dev_pm_ops s3c64xx_spi_pm = { static const struct dev_pm_ops s3c64xx_spi_pm = {
SET_SYSTEM_SLEEP_PM_OPS(s3c64xx_spi_suspend, s3c64xx_spi_resume) SET_SYSTEM_SLEEP_PM_OPS(s3c64xx_spi_suspend, s3c64xx_spi_resume)