Skip to content

Commit

Permalink
clk: mmci: convert to clk_prepare()/clk_unprepare()
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Sep 27, 2011
1 parent 4b4851c commit 52ca0f3
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1160,10 +1160,14 @@ static int __devinit mmci_probe(struct amba_device *dev,
goto host_free;
}

ret = clk_enable(host->clk);
ret = clk_prepare(host->clk);
if (ret)
goto clk_free;

ret = clk_enable(host->clk);
if (ret)
goto clk_unprep;

host->plat = plat;
host->variant = variant;
host->mclk = clk_get_rate(host->clk);
Expand Down Expand Up @@ -1351,6 +1355,8 @@ static int __devinit mmci_probe(struct amba_device *dev,
iounmap(host->base);
clk_disable:
clk_disable(host->clk);
clk_unprep:
clk_unprepare(host->clk);
clk_free:
clk_put(host->clk);
host_free:
Expand Down Expand Up @@ -1398,6 +1404,7 @@ static int __devexit mmci_remove(struct amba_device *dev)

iounmap(host->base);
clk_disable(host->clk);
clk_unprepare(host->clk);
clk_put(host->clk);

if (host->vcc)
Expand Down

0 comments on commit 52ca0f3

Please sign in to comment.