aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorShinya Kuribayashi <shinya.kuribayashi.px@renesas.com>2012-11-15 20:50:03 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 21:02:04 -0500
commitcee31c52df6263555c11cf51ee6ea30637e0cfd1 (patch)
treeb8efe7c915795e00047f36e74f9ae1fd4411f5a9 /drivers/tty
parent191c5f10275cfbb36802edadbdb10c73537327b4 (diff)
Revert "sh-sci / PM: Avoid deadlocking runtime PM"
This reverts commit 048be431e4 (sh-sci / PM: Avoid deadlocking runtime PM, from Rafael J. Wysocki <rjw@sisk.pl>, 2012-03-09). In order to get console PM work properly, we should implement uart_ops ->pm() operation, rather than sprinkle band-ading runtime PM calls in the driver. Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/sh-sci.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 6ee59001d61d..3d27f4978dd9 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1753,8 +1753,6 @@ static int sci_startup(struct uart_port *port)
1753 1753
1754 dev_dbg(port->dev, "%s(%d)\n", __func__, port->line); 1754 dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
1755 1755
1756 pm_runtime_put_noidle(port->dev);
1757
1758 sci_port_enable(s); 1756 sci_port_enable(s);
1759 1757
1760 ret = sci_request_irq(s); 1758 ret = sci_request_irq(s);
@@ -1782,8 +1780,6 @@ static void sci_shutdown(struct uart_port *port)
1782 sci_free_irq(s); 1780 sci_free_irq(s);
1783 1781
1784 sci_port_disable(s); 1782 sci_port_disable(s);
1785
1786 pm_runtime_get_noresume(port->dev);
1787} 1783}
1788 1784
1789static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps, 1785static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
@@ -2122,7 +2118,6 @@ static int __devinit sci_init_single(struct platform_device *dev,
2122 sci_init_gpios(sci_port); 2118 sci_init_gpios(sci_port);
2123 2119
2124 pm_runtime_irq_safe(&dev->dev); 2120 pm_runtime_irq_safe(&dev->dev);
2125 pm_runtime_get_noresume(&dev->dev);
2126 pm_runtime_enable(&dev->dev); 2121 pm_runtime_enable(&dev->dev);
2127 } 2122 }
2128 2123