Commit 4aaaf3ab authored by Ulf Hansson's avatar Ulf Hansson

mmc: sdio: Drop unused in-parameter from mmc_sdio_init_card()

The "powered_resume" in-parameter to mmc_sdio_init_card() has now become
redundant as all callers set it to 0. Therefore let's just drop it.
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
parent 3c30e739
...@@ -559,7 +559,7 @@ static void mmc_sdio_resend_if_cond(struct mmc_host *host, ...@@ -559,7 +559,7 @@ static void mmc_sdio_resend_if_cond(struct mmc_host *host,
* we're trying to reinitialise. * we're trying to reinitialise.
*/ */
static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
struct mmc_card *oldcard, int powered_resume) struct mmc_card *oldcard)
{ {
struct mmc_card *card; struct mmc_card *card;
int err; int err;
...@@ -582,11 +582,9 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -582,11 +582,9 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
/* /*
* Inform the card of the voltage * Inform the card of the voltage
*/ */
if (!powered_resume) { err = mmc_send_io_op_cond(host, ocr, &rocr);
err = mmc_send_io_op_cond(host, ocr, &rocr); if (err)
if (err) goto err;
goto err;
}
/* /*
* For SPI, enable CRC as appropriate. * For SPI, enable CRC as appropriate.
...@@ -645,7 +643,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -645,7 +643,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
* try to init uhs card. sdio_read_cccr will take over this task * try to init uhs card. sdio_read_cccr will take over this task
* to make sure which speed mode should work. * to make sure which speed mode should work.
*/ */
if (!powered_resume && (rocr & ocr & R4_18V_PRESENT)) { if (rocr & ocr & R4_18V_PRESENT) {
err = mmc_set_uhs_voltage(host, ocr_card); err = mmc_set_uhs_voltage(host, ocr_card);
if (err == -EAGAIN) { if (err == -EAGAIN) {
mmc_sdio_resend_if_cond(host, card); mmc_sdio_resend_if_cond(host, card);
...@@ -659,7 +657,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -659,7 +657,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
/* /*
* For native busses: set card RCA and quit open drain mode. * For native busses: set card RCA and quit open drain mode.
*/ */
if (!powered_resume && !mmc_host_is_spi(host)) { if (!mmc_host_is_spi(host)) {
err = mmc_send_relative_addr(host, &card->rca); err = mmc_send_relative_addr(host, &card->rca);
if (err) if (err)
goto remove; goto remove;
...@@ -687,7 +685,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -687,7 +685,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
/* /*
* Select card, as all following commands rely on that. * Select card, as all following commands rely on that.
*/ */
if (!powered_resume && !mmc_host_is_spi(host)) { if (!mmc_host_is_spi(host)) {
err = mmc_select_card(card); err = mmc_select_card(card);
if (err) if (err)
goto remove; goto remove;
...@@ -845,7 +843,7 @@ static int mmc_sdio_reinit_card(struct mmc_host *host) ...@@ -845,7 +843,7 @@ static int mmc_sdio_reinit_card(struct mmc_host *host)
if (ret) if (ret)
return ret; return ret;
return mmc_sdio_init_card(host, host->card->ocr, host->card, 0); return mmc_sdio_init_card(host, host->card->ocr, host->card);
} }
/* /*
...@@ -1113,7 +1111,7 @@ int mmc_attach_sdio(struct mmc_host *host) ...@@ -1113,7 +1111,7 @@ int mmc_attach_sdio(struct mmc_host *host)
/* /*
* Detect and init the card. * Detect and init the card.
*/ */
err = mmc_sdio_init_card(host, rocr, NULL, 0); err = mmc_sdio_init_card(host, rocr, NULL);
if (err) if (err)
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment