Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec833050 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
parent 92a578b0

drivers/spi/spi-coldfire-qspi.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int mcfqspi_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int mcfqspi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

drivers/spi/spi-orion.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int orion_spi_remove(struct platform_device *pdev) 


MODULE_ALIAS("platform:" DRIVER_NAME);



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int orion_spi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);

drivers/spi/spi-pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ static int pxa2xx_spi_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int pxa2xx_spi_runtime_suspend(struct device *dev)

{

	struct driver_data *drv_data = dev_get_drvdata(dev);

drivers/spi/spi-qup.c

+2 −2
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static int spi_qup_probe(struct platform_device *pdev) 
	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)

drivers/spi/spi-rockchip.c

+2 −2
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ static int rockchip_spi_resume(struct device *dev) 
}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int rockchip_spi_runtime_suspend(struct device *dev)

{

	struct spi_master *master = dev_get_drvdata(dev);
@@ -829,7 +829,7 @@ static int rockchip_spi_runtime_resume(struct device *dev) 


	return ret;

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static const struct dev_pm_ops rockchip_spi_pm = {

	SET_SYSTEM_SLEEP_PM_OPS(rockchip_spi_suspend, rockchip_spi_resume)