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

Commit a3e362f1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

serial: 8250_omap: Move wake-up interrupt to generic wakeirq 



We can now use generic wakeirq handling and remove the custom handling
for the wake-up interrupts.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ee83bd3b

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

+4 −54
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/console.h>

#include <linux/pm_qos.h>

#include <linux/pm_wakeirq.h>

#include <linux/dma-mapping.h>



#include "8250.h"
@@ -552,17 +553,6 @@ static void omap8250_uart_qos_work(struct work_struct *work) 
	pm_qos_update_request(&priv->pm_qos_request, priv->latency);

}



static irqreturn_t omap_wake_irq(int irq, void *dev_id)

{

	struct uart_port *port = dev_id;

	int ret;



	ret = port->handle_irq(port);

	if (ret)

		return IRQ_HANDLED;

	return IRQ_NONE;

}



#ifdef CONFIG_SERIAL_8250_DMA

static int omap_8250_dma_handle_irq(struct uart_port *port);

#endif
@@ -596,11 +586,9 @@ static int omap_8250_startup(struct uart_port *port) 
	int ret;



	if (priv->wakeirq) {

		ret = request_irq(priv->wakeirq, omap_wake_irq,

				  port->irqflags, "uart wakeup irq", port);

		ret = dev_pm_set_dedicated_wake_irq(port->dev, priv->wakeirq);

		if (ret)

			return ret;

		disable_irq(priv->wakeirq);

	}



	pm_runtime_get_sync(port->dev);
@@ -649,8 +637,7 @@ static int omap_8250_startup(struct uart_port *port) 
err:

	pm_runtime_mark_last_busy(port->dev);

	pm_runtime_put_autosuspend(port->dev);

	if (priv->wakeirq)

		free_irq(priv->wakeirq, port);

	dev_pm_clear_wake_irq(port->dev);

	return ret;

}
@@ -682,10 +669,8 @@ static void omap_8250_shutdown(struct uart_port *port) 


	pm_runtime_mark_last_busy(port->dev);

	pm_runtime_put_autosuspend(port->dev);



	free_irq(port->irq, port);

	if (priv->wakeirq)

		free_irq(priv->wakeirq, port);

	dev_pm_clear_wake_irq(port->dev);

}



static void omap_8250_throttle(struct uart_port *port)
@@ -1226,31 +1211,6 @@ static int omap8250_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM



static inline void omap8250_enable_wakeirq(struct omap8250_priv *priv,

					   bool enable)

{

	if (!priv->wakeirq)

		return;



	if (enable)

		enable_irq(priv->wakeirq);

	else

		disable_irq_nosync(priv->wakeirq);

}



static void omap8250_enable_wakeup(struct omap8250_priv *priv,

				   bool enable)

{

	if (enable == priv->wakeups_enabled)

		return;



	omap8250_enable_wakeirq(priv, enable);

	priv->wakeups_enabled = enable;

}

#endif



#ifdef CONFIG_PM_SLEEP

static int omap8250_prepare(struct device *dev)

{
@@ -1277,11 +1237,6 @@ static int omap8250_suspend(struct device *dev) 


	serial8250_suspend_port(priv->line);

	flush_work(&priv->qos_work);



	if (device_may_wakeup(dev))

		omap8250_enable_wakeup(priv, true);

	else

		omap8250_enable_wakeup(priv, false);

	return 0;

}
@@ -1289,9 +1244,6 @@ static int omap8250_resume(struct device *dev) 
{

	struct omap8250_priv *priv = dev_get_drvdata(dev);



	if (device_may_wakeup(dev))

		omap8250_enable_wakeup(priv, false);



	serial8250_resume_port(priv->line);

	return 0;

}
@@ -1333,7 +1285,6 @@ static int omap8250_runtime_suspend(struct device *dev) 
			return -EBUSY;

	}



	omap8250_enable_wakeup(priv, true);

	if (up->dma)

		omap_8250_rx_dma(up, UART_IIR_RX_TIMEOUT);
@@ -1354,7 +1305,6 @@ static int omap8250_runtime_resume(struct device *dev) 
		return 0;



	up = serial8250_get_port(priv->line);

	omap8250_enable_wakeup(priv, false);

	loss_cntx = omap8250_lost_context(up);



	if (loss_cntx)