diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2014-06-04 07:42:13 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-07-09 05:26:02 -0400 |
commit | 7f67f3a2ca4c1d2665b9fbe1684e29bbba2d156b (patch) | |
tree | 4eb8e69377d37739ae19176dbc9cb434ccfd2201 /drivers/mmc | |
parent | 11a808522af3a22a55ace9167670e18b22bce83d (diff) |
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.c | 6 |
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) | |||
1459 | if (pd && pd->use_cd_gpio) { | 1459 | if (pd && pd->use_cd_gpio) { |
1460 | ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); | 1460 | ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); |
1461 | if (ret < 0) | 1461 | if (ret < 0) |
1462 | goto erqcd; | 1462 | goto err_clk; |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | mutex_init(&host->thread_lock); | 1465 | mutex_init(&host->thread_lock); |
1466 | 1466 | ||
1467 | ret = mmc_add_host(mmc); | 1467 | ret = mmc_add_host(mmc); |
1468 | if (ret < 0) | 1468 | if (ret < 0) |
1469 | goto emmcaddh; | 1469 | goto err_clk; |
1470 | 1470 | ||
1471 | dev_pm_qos_expose_latency_limit(&pdev->dev, 100); | 1471 | dev_pm_qos_expose_latency_limit(&pdev->dev, 100); |
1472 | 1472 | ||
@@ -1477,8 +1477,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) | |||
1477 | clk_disable_unprepare(host->hclk); | 1477 | clk_disable_unprepare(host->hclk); |
1478 | return ret; | 1478 | return ret; |
1479 | 1479 | ||
1480 | emmcaddh: | ||
1481 | erqcd: | ||
1482 | err_clk: | 1480 | err_clk: |
1483 | clk_disable_unprepare(host->hclk); | 1481 | clk_disable_unprepare(host->hclk); |
1484 | err_pm: | 1482 | err_pm: |