Skip to content

Commit

Permalink
tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Browse files Browse the repository at this point in the history
The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME.

However, after commit b2b49cc (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 <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Rafael J. Wysocki committed Dec 19, 2014
1 parent 45544c8 commit 71504e5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/tty/serial/8250/8250_omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ static int omap_8250_startup(struct uart_port *port)
if (ret)
goto err;

#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
up->capabilities |= UART_CAP_RPM;
#endif

Expand Down Expand Up @@ -997,12 +997,12 @@ static int omap8250_probe(struct platform_device *pdev)
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
Expand Down Expand Up @@ -1105,7 +1105,7 @@ static int omap8250_remove(struct platform_device *pdev)
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)
Expand Down Expand Up @@ -1179,7 +1179,7 @@ static int omap8250_resume(struct device *dev)
#define omap8250_complete NULL
#endif

#ifdef CONFIG_PM_RUNTIME
#ifdef CONFIG_PM
static int omap8250_lost_context(struct uart_8250_port *up)
{
u32 val;
Expand Down

0 comments on commit 71504e5

Please sign in to comment.