mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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: 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:
Ulf Hansson 2019-06-18 01:20:50 +02:00
parent 3c30e73977
commit 4aaaf3ab15
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mmc/core/sdio.c
View File

@ -559,7 +559,7 @@ static void mmc_sdio_resend_if_cond(struct mmc_host *host,
* we're trying to reinitialise.
*/
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;
int err;
@ -582,11 +582,9 @@ try_again:
/*
* Inform the card of the voltage
*/
if (!powered_resume) {
err = mmc_send_io_op_cond(host, ocr, &rocr);
if (err)
goto err;
}
err = mmc_send_io_op_cond(host, ocr, &rocr);
if (err)
goto err;
/*
* For SPI, enable CRC as appropriate.
@ -645,7 +643,7 @@ try_again:
* try to init uhs card. sdio_read_cccr will take over this task
* 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);
if (err == -EAGAIN) {
mmc_sdio_resend_if_cond(host, card);
@ -659,7 +657,7 @@ try_again:
/*
* 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);
if (err)
goto remove;
@ -687,7 +685,7 @@ try_again:
/*
* 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);
if (err)
goto remove;
@ -845,7 +843,7 @@ static int mmc_sdio_reinit_card(struct mmc_host *host)
if (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)
/*
* Detect and init the card.
*/
err = mmc_sdio_init_card(host, rocr, NULL, 0);
err = mmc_sdio_init_card(host, rocr, NULL);
if (err)
goto err;