diff options
author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-10-02 18:40:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-24 14:29:30 -0400 |
commit | 9484b009b57b6523a5c7477a899f4438942febde (patch) | |
tree | d574eaab8eebf3f4463abf4daeb5a37fac47288b /drivers/tty | |
parent | b8b345bae8cb6745f2afdd28bb2d93f9cf0d7f2c (diff) |
serial: samsung: use clk_prepare_enable and clk_disable_unprepare
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/samsung.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 7f04717176aa..740458ca62cc 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c | |||
@@ -530,16 +530,16 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level, | |||
530 | switch (level) { | 530 | switch (level) { |
531 | case 3: | 531 | case 3: |
532 | if (!IS_ERR(ourport->baudclk)) | 532 | if (!IS_ERR(ourport->baudclk)) |
533 | clk_disable(ourport->baudclk); | 533 | clk_disable_unprepare(ourport->baudclk); |
534 | 534 | ||
535 | clk_disable(ourport->clk); | 535 | clk_disable_unprepare(ourport->clk); |
536 | break; | 536 | break; |
537 | 537 | ||
538 | case 0: | 538 | case 0: |
539 | clk_enable(ourport->clk); | 539 | clk_prepare_enable(ourport->clk); |
540 | 540 | ||
541 | if (!IS_ERR(ourport->baudclk)) | 541 | if (!IS_ERR(ourport->baudclk)) |
542 | clk_enable(ourport->baudclk); | 542 | clk_prepare_enable(ourport->baudclk); |
543 | 543 | ||
544 | break; | 544 | break; |
545 | default: | 545 | default: |
@@ -713,11 +713,11 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
713 | s3c24xx_serial_setsource(port, clk_sel); | 713 | s3c24xx_serial_setsource(port, clk_sel); |
714 | 714 | ||
715 | if (!IS_ERR(ourport->baudclk)) { | 715 | if (!IS_ERR(ourport->baudclk)) { |
716 | clk_disable(ourport->baudclk); | 716 | clk_disable_unprepare(ourport->baudclk); |
717 | ourport->baudclk = ERR_PTR(-EINVAL); | 717 | ourport->baudclk = ERR_PTR(-EINVAL); |
718 | } | 718 | } |
719 | 719 | ||
720 | clk_enable(clk); | 720 | clk_prepare_enable(clk); |
721 | 721 | ||
722 | ourport->baudclk = clk; | 722 | ourport->baudclk = clk; |
723 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; | 723 | ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; |
@@ -1287,9 +1287,9 @@ static int s3c24xx_serial_resume(struct device *dev) | |||
1287 | struct s3c24xx_uart_port *ourport = to_ourport(port); | 1287 | struct s3c24xx_uart_port *ourport = to_ourport(port); |
1288 | 1288 | ||
1289 | if (port) { | 1289 | if (port) { |
1290 | clk_enable(ourport->clk); | 1290 | clk_prepare_enable(ourport->clk); |
1291 | s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port)); | 1291 | s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port)); |
1292 | clk_disable(ourport->clk); | 1292 | clk_disable_unprepare(ourport->clk); |
1293 | 1293 | ||
1294 | uart_resume_port(&s3c24xx_uart_drv, port); | 1294 | uart_resume_port(&s3c24xx_uart_drv, port); |
1295 | } | 1295 | } |