Skip to content

Commit

Permalink
mmc: mmc: Move mmc_switch_status()
Browse files Browse the repository at this point in the history
Move the mmc_switch_status() function in preparation for calling it
in mmc_select_hs400().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: <stable@vger.kernel.org> # 4.2+
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Adrian Hunter authored and Ulf Hansson committed Nov 9, 2015
1 parent 51b12f7 commit 974007a
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/mmc/core/mmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 974007a

Please sign in to comment.