Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mmc/host/sh_mmcif.c

+2 −4
Original line number Diff line number Diff line
@@ -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: