aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/mmci.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-03 13:41:37 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-03 13:41:37 -0500
commita8d3584a2df28827094f6338cde1303c467bc1f0 (patch)
treed2cdb824f4b2f109ad6a74285455b56e5a2dd118 /drivers/mmc/mmci.c
parentf47fc0ac7ead5ed91a11fcabfad6ee44c17ee934 (diff)
[ARM] Remove clk_use()/clk_unuse()
It seems that clk_use() and clk_unuse() are additional complexity which isn't required anymore. Remove them from the clock framework to avoid the additional confusion which they cause, and update all ARM machine types except for OMAP. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mmc/mmci.c')
-rw-r--r--drivers/mmc/mmci.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 166c9b0ad04e..31b0b6d612bf 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -479,13 +479,9 @@ static int mmci_probe(struct amba_device *dev, void *id)
479 goto host_free; 479 goto host_free;
480 } 480 }
481 481
482 ret = clk_use(host->clk);
483 if (ret)
484 goto clk_free;
485
486 ret = clk_enable(host->clk); 482 ret = clk_enable(host->clk);
487 if (ret) 483 if (ret)
488 goto clk_unuse; 484 goto clk_free;
489 485
490 host->plat = plat; 486 host->plat = plat;
491 host->mclk = clk_get_rate(host->clk); 487 host->mclk = clk_get_rate(host->clk);
@@ -558,8 +554,6 @@ static int mmci_probe(struct amba_device *dev, void *id)
558 iounmap(host->base); 554 iounmap(host->base);
559 clk_disable: 555 clk_disable:
560 clk_disable(host->clk); 556 clk_disable(host->clk);
561 clk_unuse:
562 clk_unuse(host->clk);
563 clk_free: 557 clk_free:
564 clk_put(host->clk); 558 clk_put(host->clk);
565 host_free: 559 host_free:
@@ -594,7 +588,6 @@ static int mmci_remove(struct amba_device *dev)
594 588
595 iounmap(host->base); 589 iounmap(host->base);
596 clk_disable(host->clk); 590 clk_disable(host->clk);
597 clk_unuse(host->clk);
598 clk_put(host->clk); 591 clk_put(host->clk);
599 592
600 mmc_free_host(mmc); 593 mmc_free_host(mmc);