Skip to content

Commit

Permalink
mmc: sdhci-pxav2, sdhci-pxav3: use clk_prepare/unprepare APIs
Browse files Browse the repository at this point in the history 
Prepare the clock before enabling it.

Signed-off-by: Chao Xie <xiechao.mail@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Chao Xie authored and Chris Ball committed Sep 4, 2012
1 parent e919fd2 commit 164378e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/mmc/host/sdhci-pxav2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static int __devinit sdhci_pxav2_probe(struct platform_device *pdev)
goto err_clk_get;
}
pltfm_host->clk = clk;
clk_enable(clk);
clk_prepare_enable(clk);

host->quirks = SDHCI_QUIRK_BROKEN_ADMA
| SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
Expand Down Expand Up @@ -239,7 +239,7 @@ static int __devinit sdhci_pxav2_probe(struct platform_device *pdev)
return 0;

err_add_host:
clk_disable(clk);
clk_disable_unprepare(clk);
clk_put(clk);
err_clk_get:
sdhci_pltfm_free(pdev);
Expand All @@ -255,7 +255,7 @@ static int __devexit sdhci_pxav2_remove(struct platform_device *pdev)

sdhci_remove_host(host, 1);

clk_disable(pltfm_host->clk);
clk_disable_unprepare(pltfm_host->clk);
clk_put(pltfm_host->clk);
sdhci_pltfm_free(pdev);
kfree(pxa);
Expand Down
8 changes: 4 additions & 4 deletions drivers/mmc/host/sdhci-pxav3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,14 @@ static int __devinit sdhci_pxav3_probe(struct platform_device *pdev)
pltfm_host = sdhci_priv(host);
pltfm_host->priv = pxa;

clk = clk_get(dev, "PXA-SDHCLK");
clk = clk_get(dev, NULL);
if (IS_ERR(clk)) {
dev_err(dev, "failed to get io clock\n");
ret = PTR_ERR(clk);
goto err_clk_get;
}
pltfm_host->clk = clk;
clk_enable(clk);
clk_prepare_enable(clk);

host->quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
| SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC
Expand Down Expand Up @@ -283,7 +283,7 @@ static int __devinit sdhci_pxav3_probe(struct platform_device *pdev)
return 0;

err_add_host:
clk_disable(clk);
clk_disable_unprepare(clk);
clk_put(clk);
err_clk_get:
sdhci_pltfm_free(pdev);
Expand All @@ -299,7 +299,7 @@ static int __devexit sdhci_pxav3_remove(struct platform_device *pdev)

sdhci_remove_host(host, 1);

clk_disable(pltfm_host->clk);
clk_disable_unprepare(pltfm_host->clk);
clk_put(pltfm_host->clk);
sdhci_pltfm_free(pdev);
kfree(pxa);
Expand Down

0 comments on commit 164378e

Please sign in to comment.