提交 52ca0f3a 编写于 作者: R Russell King

clk: mmci: convert to clk_prepare()/clk_unprepare()

Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 4b4851c6
...@@ -1160,10 +1160,14 @@ static int __devinit mmci_probe(struct amba_device *dev, ...@@ -1160,10 +1160,14 @@ static int __devinit mmci_probe(struct amba_device *dev,
goto host_free; goto host_free;
} }
ret = clk_enable(host->clk); ret = clk_prepare(host->clk);
if (ret) if (ret)
goto clk_free; goto clk_free;
ret = clk_enable(host->clk);
if (ret)
goto clk_unprep;
host->plat = plat; host->plat = plat;
host->variant = variant; host->variant = variant;
host->mclk = clk_get_rate(host->clk); host->mclk = clk_get_rate(host->clk);
...@@ -1351,6 +1355,8 @@ static int __devinit mmci_probe(struct amba_device *dev, ...@@ -1351,6 +1355,8 @@ static int __devinit mmci_probe(struct amba_device *dev,
iounmap(host->base); iounmap(host->base);
clk_disable: clk_disable:
clk_disable(host->clk); clk_disable(host->clk);
clk_unprep:
clk_unprepare(host->clk);
clk_free: clk_free:
clk_put(host->clk); clk_put(host->clk);
host_free: host_free:
...@@ -1398,6 +1404,7 @@ static int __devexit mmci_remove(struct amba_device *dev) ...@@ -1398,6 +1404,7 @@ static int __devexit mmci_remove(struct amba_device *dev)
iounmap(host->base); iounmap(host->base);
clk_disable(host->clk); clk_disable(host->clk);
clk_unprepare(host->clk);
clk_put(host->clk); clk_put(host->clk);
if (host->vcc) if (host->vcc)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册