[PATCH 3/4] tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
From: Rafael J. Wysocki <hidden>
Date: 2014-12-19 01:42:22
Also in:
linux-pm, lkml
From: Rafael J. Wysocki <redacted> The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME. However, 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 8250_omap.c. Signed-off-by: Rafael J. Wysocki <redacted> --- Please let me know if there are any objections against pushing this through the linux-pm tree. --- drivers/tty/serial/8250/8250_omap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Index: linux-pm/drivers/tty/serial/8250/8250_omap.c ===================================================================
--- linux-pm.orig/drivers/tty/serial/8250/8250_omap.c
+++ linux-pm/drivers/tty/serial/8250/8250_omap.c@@ -561,7 +561,7 @@ static int omap_8250_startup(struct uart if (ret) goto err; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM up->capabilities |= UART_CAP_RPM; #endif
@@ -997,12 +997,12 @@ static int omap8250_probe(struct platfor up.port.fifosize = 64; up.tx_loadsz = 64; up.capabilities = UART_CAP_FIFO; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM /* - * PM_RUNTIME is mostly transparent. However to do it right we need to a + * Runtime PM is mostly transparent. However to do it right we need to a * TX empty interrupt before we can put the device to auto idle. So if - * PM_RUNTIME is not enabled we don't add that flag and can spare that - * one extra interrupt in the TX path. + * PM is not enabled we don't add that flag and can spare that one extra + * interrupt in the TX path. */ up.capabilities |= UART_CAP_RPM; #endif
@@ -1105,7 +1105,7 @@ static int omap8250_remove(struct platfo return 0; } -#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_RUNTIME) +#ifdef CONFIG_PM static inline void omap8250_enable_wakeirq(struct omap8250_priv *priv, bool enable)
@@ -1179,7 +1179,7 @@ static int omap8250_resume(struct device #define omap8250_complete NULL #endif -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int omap8250_lost_context(struct uart_8250_port *up) { u32 val;