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>

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 6ee59001d61d742d1c0bd0f73355c10421fb3f4d..3d27f4978dd904ab17a7cb95c3d183810ede11f9 100644 (file)
--- 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)
 
        dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);
 
-       pm_runtime_put_noidle(port->dev);
-
        sci_port_enable(s);
 
        ret = sci_request_irq(s);
@@ -1782,8 +1780,6 @@ static void sci_shutdown(struct uart_port *port)
        sci_free_irq(s);
 
        sci_port_disable(s);
-
-       pm_runtime_get_noresume(port->dev);
 }
 
 static 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,
                sci_init_gpios(sci_port);
 
                pm_runtime_irq_safe(&dev->dev);
-               pm_runtime_get_noresume(&dev->dev);
                pm_runtime_enable(&dev->dev);
        }