Skip to content

Commit

Permalink
Revert "sh-sci / PM: Avoid deadlocking runtime PM"
Browse files Browse the repository at this point in the history
This reverts commit 048be43 (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>
  • Loading branch information
Shinya Kuribayashi authored and Greg Kroah-Hartman committed Nov 16, 2012
1 parent 191c5f1 commit cee31c5
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/tty/serial/sh-sci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit cee31c5

Please sign in to comment.