NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Subsystems (2)
PATCH 1/1 NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
From: Rafael J. Wysocki <[email protected]>
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 in drivers/nfc/trf7970a.c.
---
Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected) which is only in linux-next at the moment (via the linux-pm tree).
Please let me know if it is OK to take this one into linux-pm.
--- drivers/nfc/trf7970a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/trf7970a.c +1 -1
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device }#endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int trf7970a_pm_runtime_suspend (struct device *dev) { struct spi_device *spi = container_of(dev, struct spi_device, dev);
PATCH RESEND 1/1 NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
From: Rafael J. Wysocki <[email protected]>
Subject: NFC / PM: 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 in drivers/nfc/trf7970a.c.
---
Please let me know if there are any objections against this. If not, I'll take it through the linux-pm tree, as I'm going to remove CONFIG_PM_RUNTIME entirely shortly.
--- drivers/nfc/trf7970a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/trf7970a.c +1 -1
@@ -2154,7 +2154,7 @@ static int trf7970a_resume(struct device }#endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int trf7970a_pm_runtime_suspend (struct device *dev) { struct spi_device *spi = container_of(dev, struct spi_device, dev);