evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sdhci-dove: use devm_clk_get()

Browse source 
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>
This commit is contained in:
Russell King 2012-11-22 23:55:10 +00:00 • committed by Chris Ball
parent a4071fbbb9
commit 7430e77e64
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/mmc/host/sdhci-dove.c
View file

@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
priv->clk = clk_get(&pdev->dev, NULL); priv->clk = devm_clk_get(&pdev->dev, NULL);
if (!IS_ERR(priv->clk)) if (!IS_ERR(priv->clk))
clk_prepare_enable(priv->clk); clk_prepare_enable(priv->clk);
@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
return 0; return 0;
sdhci_dove_register_fail: sdhci_dove_register_fail:
if (!IS_ERR(priv->clk)) { if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk); clk_disable_unprepare(priv->clk);
clk_put(priv->clk);
}
return ret; return ret;
} }
@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev)
sdhci_pltfm_unregister(pdev); sdhci_pltfm_unregister(pdev);
if (!IS_ERR(priv->clk)) { if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk); clk_disable_unprepare(priv->clk);
clk_put(priv->clk);
}
return 0; return 0;
} }