From: Ben Dooks Date: Wed, 4 Jun 2014 11:42:13 +0000 (+0100) Subject: mmc: sh-mmcif: final error path cleanup X-Git-Tag: upstream/snapshot3+hdmi~344 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5d8077340e3990567291fb4b0d7265e63b0172c;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Ulf Hansson (cherry picked from commit 39792eaab1561e145b07cc36025c23b175b26a1e) Signed-off-by: Simon Horman --- diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 80e200e..0289b4e 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: