Commit 364549dd authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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



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

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1e5a0a9a

drivers/mmc/core/mmc.c

+1 −13
Original line number Diff line number Diff line
@@ -1910,17 +1910,6 @@ static int mmc_runtime_resume(struct mmc_host *host) 
	return 0;

}



static int mmc_power_restore(struct mmc_host *host)

{

	int ret;



	mmc_claim_host(host);

	ret = mmc_init_card(host, host->card->ocr, host->card);

	mmc_release_host(host);



	return ret;

}



int mmc_can_reset(struct mmc_card *card)

{

	u8 rst_n_function;
@@ -1958,7 +1947,7 @@ static int mmc_reset(struct mmc_host *host) 
	mmc_set_initial_state(host);

	mmc_host_clk_release(host);



	return mmc_power_restore(host);

	return mmc_init_card(host, card->ocr, card);

}



static const struct mmc_bus_ops mmc_ops = {
@@ -1968,7 +1957,6 @@ static const struct mmc_bus_ops mmc_ops = { 
	.resume = mmc_resume,

	.runtime_suspend = mmc_runtime_suspend,

	.runtime_resume = mmc_runtime_resume,

	.power_restore = mmc_power_restore,

	.alive = mmc_alive,

	.shutdown = mmc_shutdown,

	.reset = mmc_reset,