lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

serial: samsung: use clk_prepare_enable and clk_disable_unprepare

Browse Source 
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>
This commit is contained in:
Thomas Abraham
2012-10-03 07:40:04 +09:00
committed by Greg Kroah-Hartman
parent b8b345bae8
commit 9484b009b5
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/tty/serial/samsung.c
View File

@@ -530,16 +530,16 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
switch (level) { switch (level) {
case 3: case 3:
if (!IS_ERR(ourport->baudclk)) if (!IS_ERR(ourport->baudclk))
clk_disable(ourport->baudclk); clk_disable_unprepare(ourport->baudclk);
clk_disable(ourport->clk); clk_disable_unprepare(ourport->clk);
break; break;
case 0: case 0:
clk_enable(ourport->clk); clk_prepare_enable(ourport->clk);
if (!IS_ERR(ourport->baudclk)) if (!IS_ERR(ourport->baudclk))
clk_enable(ourport->baudclk); clk_prepare_enable(ourport->baudclk);
break; break;
default: default:
@@ -713,11 +713,11 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
s3c24xx_serial_setsource(port, clk_sel); s3c24xx_serial_setsource(port, clk_sel);
if (!IS_ERR(ourport->baudclk)) { if (!IS_ERR(ourport->baudclk)) {
clk_disable(ourport->baudclk); clk_disable_unprepare(ourport->baudclk);
ourport->baudclk = ERR_PTR(-EINVAL); ourport->baudclk = ERR_PTR(-EINVAL);
} }
clk_enable(clk); clk_prepare_enable(clk);
ourport->baudclk = clk; ourport->baudclk = clk;
ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0; ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0;
@@ -1287,9 +1287,9 @@ static int s3c24xx_serial_resume(struct device *dev)
struct s3c24xx_uart_port *ourport = to_ourport(port); struct s3c24xx_uart_port *ourport = to_ourport(port);
if (port) { if (port) {
clk_enable(ourport->clk); clk_prepare_enable(ourport->clk);
s3c24xx_serial_resetport(port, s3c24xx_port_to_cfg(port)); 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); uart_resume_port(&s3c24xx_uart_drv, port);
} }