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

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

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-09-22 11:36:41 +01:00
parent 4b4851c65d
commit 52ca0f3ab5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/mmci.c
View File

@@ -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,
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)
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)