From: Ben Dooks Date: Wed, 4 Jun 2014 11:42:13 +0000 (+0100) Subject: mmc: sh-mmcif: final error path cleanup X-Git-Tag: v3.17-rc1~30^2~46 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f67f3a2ca4c1d2665b9fbe1684e29bbba2d156b;p=uclinux-h8%2Flinux.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 --- 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: