Skip to content

Commit

Permalink
serial: samsung: use clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Thomas Abraham authored and Greg Kroah-Hartman committed Oct 24, 2012
1 parent b8b345b commit 9484b00
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/tty/serial/samsung.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,16 +530,16 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
switch (level) {
case 3:
if (!IS_ERR(ourport->baudclk))
clk_disable(ourport->baudclk);
clk_disable_unprepare(ourport->baudclk);

clk_disable(ourport->clk);
clk_disable_unprepare(ourport->clk);
break;

case 0:
clk_enable(ourport->clk);
clk_prepare_enable(ourport->clk);

if (!IS_ERR(ourport->baudclk))
clk_enable(ourport->baudclk);
clk_prepare_enable(ourport->baudclk);

break;
default:
Expand Down Expand Up @@ -713,11 +713,11 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
s3c24xx_serial_setsource(port, clk_sel);

if (!IS_ERR(ourport->baudclk)) {
clk_disable(ourport->baudclk);
clk_disable_unprepare(ourport->baudclk);
ourport->baudclk = ERR_PTR(-EINVAL);
}

clk_enable(clk);
clk_prepare_enable(clk);

ourport->baudclk = clk;
ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0;
Expand Down Expand Up @@ -1287,9 +1287,9 @@ static int s3c24xx_serial_resume(struct device *dev)
struct s3c24xx_uart_port *ourport = to_ourport(port);

if (port) {
clk_enable(ourport->clk);
clk_prepare_enable(ourport->clk);
s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port));
clk_disable(ourport->clk);
clk_disable_unprepare(ourport->clk);

uart_resume_port(&s3c24xx_uart_drv, port);
}
Expand Down

0 comments on commit 9484b00

Please sign in to comment.