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

Commit 0cc81a8c authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Remove redundant mmc_power_up|off at runtime callbacks 



Commit "mmc: core: Push common suspend|resume code into each bus_ops"
moved the responsibility for doing mmc_power_up|off into each
suspend/resume bus_ops. When using MMC_CAP_AGGRESSIVE_PM, through the
runtime callbacks, calls to mmc_power_up|off became redundant.

When removing them, we are also able to remove the calls to
mmc_claim|release_host, thus simplifing code a bit more.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 9ec775f7

drivers/mmc/core/mmc.c

+1 −12
Original line number Diff line number Diff line
@@ -1575,18 +1575,11 @@ static int mmc_runtime_suspend(struct mmc_host *host) 
	if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))

		return 0;



	mmc_claim_host(host);



	err = mmc_suspend(host);

	if (err) {

	if (err)

		pr_err("%s: error %d doing aggessive suspend\n",

			mmc_hostname(host), err);

		goto out;

	}

	mmc_power_off(host);



out:

	mmc_release_host(host);

	return err;

}
@@ -1600,15 +1593,11 @@ static int mmc_runtime_resume(struct mmc_host *host) 
	if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))

		return 0;



	mmc_claim_host(host);



	mmc_power_up(host, host->card->ocr);

	err = mmc_resume(host);

	if (err)

		pr_err("%s: error %d doing aggessive resume\n",

			mmc_hostname(host), err);



	mmc_release_host(host);

	return 0;

}

drivers/mmc/core/sd.c

+1 −12
Original line number Diff line number Diff line
@@ -1132,18 +1132,11 @@ static int mmc_sd_runtime_suspend(struct mmc_host *host) 
	if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))

		return 0;



	mmc_claim_host(host);



	err = mmc_sd_suspend(host);

	if (err) {

	if (err)

		pr_err("%s: error %d doing aggessive suspend\n",

			mmc_hostname(host), err);

		goto out;

	}

	mmc_power_off(host);



out:

	mmc_release_host(host);

	return err;

}
@@ -1157,15 +1150,11 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) 
	if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))

		return 0;



	mmc_claim_host(host);



	mmc_power_up(host, host->card->ocr);

	err = mmc_sd_resume(host);

	if (err)

		pr_err("%s: error %d doing aggessive resume\n",

			mmc_hostname(host), err);



	mmc_release_host(host);

	return 0;

}