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

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

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 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/ (again).

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
parent c0f486fd

drivers/spi/spi-img-spfi.c

+2 −2
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int img_spfi_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int img_spfi_runtime_suspend(struct device *dev)

{

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


	return 0;

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_SLEEP

static int img_spfi_suspend(struct device *dev)

drivers/spi/spi-meson-spifc.c

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

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int meson_spifc_runtime_suspend(struct device *dev)

{

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


	return clk_prepare_enable(spifc->clk);

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static const struct dev_pm_ops meson_spifc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(meson_spifc_suspend, meson_spifc_resume)