summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorBen Dooks <ben.dooks@codethink.co.uk>2014-06-04 15:42:13 +0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-07-09 13:26:02 +0400
commit7f67f3a2ca4c1d2665b9fbe1684e29bbba2d156b (patch)
tree4eb8e69377d37739ae19176dbc9cb434ccfd2201 /drivers/mmc
parent11a808522af3a22a55ace9167670e18b22bce83d (diff)
downloadlinux-7f67f3a2ca4c1d2665b9fbe1684e29bbba2d156b.tar.xz
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: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sh_mmcif.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 80e200e59dda..0289b4ecccb3 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1459,14 +1459,14 @@ static int sh_mmcif_probe(struct platform_device *pdev)
if (pd && pd->use_cd_gpio) {
ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0);
if (ret < 0)
- goto erqcd;
+ goto err_clk;
}
mutex_init(&host->thread_lock);
ret = mmc_add_host(mmc);
if (ret < 0)
- goto emmcaddh;
+ goto err_clk;
dev_pm_qos_expose_latency_limit(&pdev->dev, 100);
@@ -1477,8 +1477,6 @@ static int sh_mmcif_probe(struct platform_device *pdev)
clk_disable_unprepare(host->hclk);
return ret;
-emmcaddh:
-erqcd:
err_clk:
clk_disable_unprepare(host->hclk);
err_pm: