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

Commit 974007aa authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: mmc: Move mmc_switch_status() 



Move the mmc_switch_status() function in preparation for calling it
in mmc_select_hs400().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: <stable@vger.kernel.org> # 4.2+
Tested-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 51b12f77

drivers/mmc/core/mmc.c

+13 −13
Original line number Diff line number Diff line
@@ -1040,6 +1040,19 @@ static int mmc_select_hs_ddr(struct mmc_card *card) 
	return err;

}



/* Caller must hold re-tuning */

static int mmc_switch_status(struct mmc_card *card)

{

	u32 status;

	int err;



	err = mmc_send_status(card, &status);

	if (err)

		return err;



	return mmc_switch_status_error(card->host, status);

}



static int mmc_select_hs400(struct mmc_card *card)

{

	struct mmc_host *host = card->host;
@@ -1107,19 +1120,6 @@ int mmc_hs200_to_hs400(struct mmc_card *card) 
	return mmc_select_hs400(card);

}



/* Caller must hold re-tuning */

static int mmc_switch_status(struct mmc_card *card)

{

	u32 status;

	int err;



	err = mmc_send_status(card, &status);

	if (err)

		return err;



	return mmc_switch_status_error(card->host, status);

}



int mmc_hs400_to_hs200(struct mmc_card *card)

{

	struct mmc_host *host = card->host;