Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee550947 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: sdio: Move comment about re-initialization to mmc_sdio_reinit_card() 



The comment in mmc_sdio_power_restore() belongs in mmc_sdio_reinit_card(),
which was created during a previous commit that re-factored some code. Fix
this by moving the comment into mmc_sdio_reinit_card().

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
parent cd23042d

drivers/mmc/core/sdio.c

+17 −17
Original line number Diff line number Diff line
@@ -820,6 +820,23 @@ static int mmc_sdio_reinit_card(struct mmc_host *host, bool powered_resume) 
{

	int ret;



	/*

	 * Reset the card by performing the same steps that are taken by

	 * mmc_rescan_try_freq() and mmc_attach_sdio() during a "normal" probe.

	 *

	 * sdio_reset() is technically not needed. Having just powered up the

	 * hardware, it should already be in reset state. However, some

	 * platforms (such as SD8686 on OLPC) do not instantly cut power,

	 * meaning that a reset is required when restoring power soon after

	 * powering off. It is harmless in other cases.

	 *

	 * The CMD5 reset (mmc_send_io_op_cond()), according to the SDIO spec,

	 * is not necessary for non-removable cards. However, it is required

	 * for OLPC SD8686 (which expects a [CMD5,5,3,7] init sequence), and

	 * harmless in other situations.

	 *

	 */



	sdio_reset(host);

	mmc_go_idle(host);

	mmc_send_if_cond(host, host->card->ocr);
@@ -1013,23 +1030,6 @@ static int mmc_sdio_power_restore(struct mmc_host *host) 
{

	int ret;



	/*

	 * Reset the card by performing the same steps that are taken by

	 * mmc_rescan_try_freq() and mmc_attach_sdio() during a "normal" probe.

	 *

	 * sdio_reset() is technically not needed. Having just powered up the

	 * hardware, it should already be in reset state. However, some

	 * platforms (such as SD8686 on OLPC) do not instantly cut power,

	 * meaning that a reset is required when restoring power soon after

	 * powering off. It is harmless in other cases.

	 *

	 * The CMD5 reset (mmc_send_io_op_cond()), according to the SDIO spec,

	 * is not necessary for non-removable cards. However, it is required

	 * for OLPC SD8686 (which expects a [CMD5,5,3,7] init sequence), and

	 * harmless in other situations.

	 *

	 */



	ret = mmc_sdio_reinit_card(host, mmc_card_keep_power(host));

	if (!ret && host->sdio_irqs)

		mmc_signal_sdio_irq(host);