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

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

tty: 8250_omap: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



The 8250_omap serial driver is a new user of CONFIG_PM_RUNTIME.

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 in 8250_omap.c.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45544c88

drivers/tty/serial/8250/8250_omap.c

+7 −7
Original line number Diff line number Diff line
@@ -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
@@ -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
@@ -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)
@@ -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;