Commit 3056c49c authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Remove redundant ->power_restore() callback for SD



Since the ->reset() callback is implemented for SD, the ->power_restore()
callback has become redundant, let's remove it.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 364549dd
Loading
Loading
Loading
Loading
+1 −13
Original line number Diff line number Diff line
@@ -1164,21 +1164,10 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
	return 0;
}

static int mmc_sd_power_restore(struct mmc_host *host)
{
	int ret;

	mmc_claim_host(host);
	ret = mmc_sd_init_card(host, host->card->ocr, host->card);
	mmc_release_host(host);

	return ret;
}

static int mmc_sd_reset(struct mmc_host *host)
{
	mmc_power_cycle(host, host->card->ocr);
	return mmc_sd_power_restore(host);
	return mmc_sd_init_card(host, host->card->ocr, host->card);
}

static const struct mmc_bus_ops mmc_sd_ops = {
@@ -1188,7 +1177,6 @@ static const struct mmc_bus_ops mmc_sd_ops = {
	.runtime_resume = mmc_sd_runtime_resume,
	.suspend = mmc_sd_suspend,
	.resume = mmc_sd_resume,
	.power_restore = mmc_sd_power_restore,
	.alive = mmc_sd_alive,
	.shutdown = mmc_sd_suspend,
	.reset = mmc_sd_reset,