public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ulf Hansson 2015-06-01 11:14:58 +02:00
parent 364549ddc2
commit 3056c49c35
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/mmc/core/sd.c
View file

@ -1164,21 +1164,10 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
return 0; 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) static int mmc_sd_reset(struct mmc_host *host)
{ {
mmc_power_cycle(host, host->card->ocr); 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 = { 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, .runtime_resume = mmc_sd_runtime_resume,
.suspend = mmc_sd_suspend, .suspend = mmc_sd_suspend,
.resume = mmc_sd_resume, .resume = mmc_sd_resume,
.power_restore = mmc_sd_power_restore,
.alive = mmc_sd_alive, .alive = mmc_sd_alive,
.shutdown = mmc_sd_suspend, .shutdown = mmc_sd_suspend,
.reset = mmc_sd_reset, .reset = mmc_sd_reset,