Skip to content

Commit

Permalink
mmc: sdhci-dove: use devm_clk_get()
Browse files Browse the repository at this point in the history
Use devm_clk_get() rather than clk_get() to make cleanup paths more simple.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Russell King authored and Chris Ball committed Dec 6, 2012
1 parent a4071fb commit 7430e77
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/mmc/host/sdhci-dove.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
return -ENOMEM;
}

priv->clk = clk_get(&pdev->dev, NULL);
priv->clk = devm_clk_get(&pdev->dev, NULL);
if (!IS_ERR(priv->clk))
clk_prepare_enable(priv->clk);

Expand All @@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
return 0;

sdhci_dove_register_fail:
if (!IS_ERR(priv->clk)) {
if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk);
clk_put(priv->clk);
}
return ret;
}

Expand All @@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev)

sdhci_pltfm_unregister(pdev);

if (!IS_ERR(priv->clk)) {
if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk);
clk_put(priv->clk);
}

return 0;
}

Expand Down

0 comments on commit 7430e77

Please sign in to comment.