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

mmc: sdhci-spear: fix error handling paths for DT

Browse source 
Fix the error handling paths for DT and simplify using the devm_* API
for clk_get().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
Russell King 2014-02-28 21:32:29 +00:00 • committed by Chris Ball
parent 4025ce24f3
commit 142dbab951
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/mmc/host/sdhci-spear.c
View file

@ -129,7 +129,7 @@ static int sdhci_probe(struct platform_device *pdev)
} }
/* clk enable */ /* clk enable */
sdhci->clk = clk_get(&pdev->dev, NULL); sdhci->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(sdhci->clk)) { if (IS_ERR(sdhci->clk)) {
ret = PTR_ERR(sdhci->clk); ret = PTR_ERR(sdhci->clk);
dev_dbg(&pdev->dev, "Error getting clock\n"); dev_dbg(&pdev->dev, "Error getting clock\n");
@ -139,7 +139,7 @@ static int sdhci_probe(struct platform_device *pdev)
ret = clk_prepare_enable(sdhci->clk); ret = clk_prepare_enable(sdhci->clk);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "Error enabling clock\n"); dev_dbg(&pdev->dev, "Error enabling clock\n");
goto put_clk; goto err;
} }
ret = clk_set_rate(sdhci->clk, 50000000); ret = clk_set_rate(sdhci->clk, 50000000);
@ -151,7 +151,7 @@ static int sdhci_probe(struct platform_device *pdev)
sdhci->data = sdhci_probe_config_dt(pdev); sdhci->data = sdhci_probe_config_dt(pdev);
if (IS_ERR(sdhci->data)) { if (IS_ERR(sdhci->data)) {
dev_err(&pdev->dev, "DT: Failed to get pdata\n"); dev_err(&pdev->dev, "DT: Failed to get pdata\n");
return -ENODEV; goto disable_clk;
} }
} else { } else {
sdhci->data = dev_get_platdata(&pdev->dev); sdhci->data = dev_get_platdata(&pdev->dev);
@ -261,8 +261,6 @@ free_host:
sdhci_free_host(host); sdhci_free_host(host);
disable_clk: disable_clk:
clk_disable_unprepare(sdhci->clk); clk_disable_unprepare(sdhci->clk);
put_clk:
clk_put(sdhci->clk);
err: err:
dev_err(&pdev->dev, "spear-sdhci probe failed: %d\n", ret); dev_err(&pdev->dev, "spear-sdhci probe failed: %d\n", ret);
return ret; return ret;
@ -282,7 +280,6 @@ static int sdhci_remove(struct platform_device *pdev)
sdhci_remove_host(host, dead); sdhci_remove_host(host, dead);
sdhci_free_host(host); sdhci_free_host(host);
clk_disable_unprepare(sdhci->clk); clk_disable_unprepare(sdhci->clk);
clk_put(sdhci->clk);
return 0; return 0;
} }