mmc: sdio: Drop unused in-parameter to mmc_sdio_reinit_card()
The "powered_resume" in-parameter to mmc_sdio_reinit_card() has now become redundant as all callers set it to 0. Therefore let's just drop it. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Tested-by: Douglas Anderson <dianders@chromium.org>
This commit is contained in:
Родитель
6ebc581c3f
Коммит
3c30e73977
|
@ -816,7 +816,7 @@ err:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int mmc_sdio_reinit_card(struct mmc_host *host, bool powered_resume)
|
||||
static int mmc_sdio_reinit_card(struct mmc_host *host)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
@ -845,8 +845,7 @@ static int mmc_sdio_reinit_card(struct mmc_host *host, bool powered_resume)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
return mmc_sdio_init_card(host, host->card->ocr, host->card,
|
||||
powered_resume);
|
||||
return mmc_sdio_init_card(host, host->card->ocr, host->card, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1000,7 +999,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
|
|||
pm_runtime_set_active(&host->card->dev);
|
||||
pm_runtime_enable(&host->card->dev);
|
||||
}
|
||||
err = mmc_sdio_reinit_card(host, 0);
|
||||
err = mmc_sdio_reinit_card(host);
|
||||
} else if (mmc_card_wake_sdio_irq(host)) {
|
||||
/* We may have switched to 1-bit mode during suspend */
|
||||
err = sdio_enable_4bit_bus(host->card);
|
||||
|
@ -1026,11 +1025,6 @@ out:
|
|||
return err;
|
||||
}
|
||||
|
||||
static int mmc_sdio_power_restore(struct mmc_host *host)
|
||||
{
|
||||
return mmc_sdio_reinit_card(host, 0);
|
||||
}
|
||||
|
||||
static int mmc_sdio_runtime_suspend(struct mmc_host *host)
|
||||
{
|
||||
/* No references to the card, cut the power to it. */
|
||||
|
@ -1048,7 +1042,7 @@ static int mmc_sdio_runtime_resume(struct mmc_host *host)
|
|||
/* Restore power and re-initialize. */
|
||||
mmc_claim_host(host);
|
||||
mmc_power_up(host, host->card->ocr);
|
||||
ret = mmc_sdio_power_restore(host);
|
||||
ret = mmc_sdio_reinit_card(host);
|
||||
mmc_release_host(host);
|
||||
|
||||
return ret;
|
||||
|
@ -1057,7 +1051,7 @@ static int mmc_sdio_runtime_resume(struct mmc_host *host)
|
|||
static int mmc_sdio_hw_reset(struct mmc_host *host)
|
||||
{
|
||||
mmc_power_cycle(host, host->card->ocr);
|
||||
return mmc_sdio_power_restore(host);
|
||||
return mmc_sdio_reinit_card(host);
|
||||
}
|
||||
|
||||
static int mmc_sdio_sw_reset(struct mmc_host *host)
|
||||
|
@ -1069,7 +1063,7 @@ static int mmc_sdio_sw_reset(struct mmc_host *host)
|
|||
mmc_set_initial_state(host);
|
||||
mmc_set_initial_signal_voltage(host);
|
||||
|
||||
return mmc_sdio_reinit_card(host, 0);
|
||||
return mmc_sdio_reinit_card(host);
|
||||
}
|
||||
|
||||
static const struct mmc_bus_ops mmc_sdio_ops = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче