| Message ID | 1483952180-85063-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 9 January 2017 at 09:56, Shawn Lin <shawn.lin@rock-chips.com> wrote: > Add new helper function, mmc_sdio_resend_if_cond, to be > reused when trying to retry the init sequence. > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Thanks, applied for next! Kind regards Uffe > > --- > > Changes in v2: > - rename the funtion to mmc_sdio_resend_if_cond > - move the control of retries outside the helper function > > drivers/mmc/core/sdio.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c > index ecbc529..f417adc 100644 > --- a/drivers/mmc/core/sdio.c > +++ b/drivers/mmc/core/sdio.c > @@ -541,6 +541,15 @@ static int mmc_sdio_init_uhs_card(struct mmc_card *card) > return err; > } > > +static void mmc_sdio_resend_if_cond(struct mmc_host *host, > + struct mmc_card *card) > +{ > + sdio_reset(host); > + mmc_go_idle(host); > + mmc_send_if_cond(host, host->ocr_avail); > + mmc_remove_card(card); > +} > + > /* > * Handle the detection and initialisation of a card. > * > @@ -630,10 +639,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, > err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, > ocr_card); > if (err == -EAGAIN) { > - sdio_reset(host); > - mmc_go_idle(host); > - mmc_send_if_cond(host, host->ocr_avail); > - mmc_remove_card(card); > + mmc_sdio_resend_if_cond(host, card); > retries--; > goto try_again; > } else if (err) { > -- > 1.9.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index ecbc529..f417adc 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -541,6 +541,15 @@ static int mmc_sdio_init_uhs_card(struct mmc_card *card) return err; } +static void mmc_sdio_resend_if_cond(struct mmc_host *host, + struct mmc_card *card) +{ + sdio_reset(host); + mmc_go_idle(host); + mmc_send_if_cond(host, host->ocr_avail); + mmc_remove_card(card); +} + /* * Handle the detection and initialisation of a card. * @@ -630,10 +639,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, ocr_card); if (err == -EAGAIN) { - sdio_reset(host); - mmc_go_idle(host); - mmc_send_if_cond(host, host->ocr_avail); - mmc_remove_card(card); + mmc_sdio_resend_if_cond(host, card); retries--; goto try_again; } else if (err) {
Add new helper function, mmc_sdio_resend_if_cond, to be reused when trying to retry the init sequence. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> --- Changes in v2: - rename the funtion to mmc_sdio_resend_if_cond - move the control of retries outside the helper function drivers/mmc/core/sdio.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)