Commit 7f67f3a2 authored by Ben Dooks's avatar Ben Dooks Committed by Ulf Hansson

mmc: sh-mmcif: final error path cleanup

Remove the error path items that are no longer needed. The mmc card-detect
code cleans up after itself (and registers with devm) and the host error
is the same as the clock disable.
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 11a80852
...@@ -1459,14 +1459,14 @@ static int sh_mmcif_probe(struct platform_device *pdev) ...@@ -1459,14 +1459,14 @@ static int sh_mmcif_probe(struct platform_device *pdev)
if (pd && pd->use_cd_gpio) { if (pd && pd->use_cd_gpio) {
ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0);
if (ret < 0) if (ret < 0)
goto erqcd; goto err_clk;
} }
mutex_init(&host->thread_lock); mutex_init(&host->thread_lock);
ret = mmc_add_host(mmc); ret = mmc_add_host(mmc);
if (ret < 0) if (ret < 0)
goto emmcaddh; goto err_clk;
dev_pm_qos_expose_latency_limit(&pdev->dev, 100); dev_pm_qos_expose_latency_limit(&pdev->dev, 100);
...@@ -1477,8 +1477,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) ...@@ -1477,8 +1477,6 @@ static int sh_mmcif_probe(struct platform_device *pdev)
clk_disable_unprepare(host->hclk); clk_disable_unprepare(host->hclk);
return ret; return ret;
emmcaddh:
erqcd:
err_clk: err_clk:
clk_disable_unprepare(host->hclk); clk_disable_unprepare(host->hclk);
err_pm: err_pm:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment