It's for migrating to generic clk framework API.

Signed-off-by: Richard Zhao <richard.z...@linaro.org>
---
 drivers/tty/serial/imx.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 163fc90..8f3709f 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1390,7 +1390,7 @@ static int serial_imx_probe(struct platform_device *pdev)
                ret = PTR_ERR(sport->clk);
                goto unmap;
        }
-       clk_enable(sport->clk);
+       clk_prepare_enable(sport->clk);
 
        sport->port.uartclk = clk_get_rate(sport->clk);
 
@@ -1413,8 +1413,8 @@ deinit:
        if (pdata && pdata->exit)
                pdata->exit(pdev);
 clkput:
+       clk_disable_unprepare(sport->clk);
        clk_put(sport->clk);
-       clk_disable(sport->clk);
 unmap:
        iounmap(sport->port.membase);
 free:
@@ -1434,11 +1434,10 @@ static int serial_imx_remove(struct platform_device 
*pdev)
 
        if (sport) {
                uart_remove_one_port(&imx_reg, &sport->port);
+               clk_disable_unprepare(sport->clk);
                clk_put(sport->clk);
        }
 
-       clk_disable(sport->clk);
-
        if (pdata && pdata->exit)
                pdata->exit(pdev);
 
-- 
1.7.5.4


--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to