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

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

mmc: core: Move mmc_flush_cache() from core.c to mmc_ops.c 



The mmc_flush_cache() is a eMMC specific function, let's move it to
mmc_ops.c to make that clear.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent 0f2c0512

drivers/mmc/core/core.c

+0 −21
Original line number Diff line number Diff line
@@ -2729,27 +2729,6 @@ int mmc_power_restore_host(struct mmc_host *host) 
}

EXPORT_SYMBOL(mmc_power_restore_host);



/*

 * Flush the cache to the non-volatile storage.

 */

int mmc_flush_cache(struct mmc_card *card)

{

	int err = 0;



	if (mmc_card_mmc(card) &&

			(card->ext_csd.cache_size > 0) &&

			(card->ext_csd.cache_ctrl & 1)) {

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				EXT_CSD_FLUSH_CACHE, 1, 0);

		if (err)

			pr_err("%s: cache flush error %d\n",

					mmc_hostname(card->host), err);

	}



	return err;

}

EXPORT_SYMBOL(mmc_flush_cache);



#ifdef CONFIG_PM_SLEEP

/* Do the card removal on suspend if card is assumed removeable

 * Do that in pm notifier while userspace isn't yet frozen, so we will be able

drivers/mmc/core/mmc_ops.c

+21 −0
Original line number Diff line number Diff line
@@ -1022,6 +1022,27 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception) 
	mmc_release_host(card->host);

}



/*

 * Flush the cache to the non-volatile storage.

 */

int mmc_flush_cache(struct mmc_card *card)

{

	int err = 0;



	if (mmc_card_mmc(card) &&

			(card->ext_csd.cache_size > 0) &&

			(card->ext_csd.cache_ctrl & 1)) {

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				EXT_CSD_FLUSH_CACHE, 1, 0);

		if (err)

			pr_err("%s: cache flush error %d\n",

					mmc_hostname(card->host), err);

	}



	return err;

}

EXPORT_SYMBOL(mmc_flush_cache);



static int mmc_cmdq_switch(struct mmc_card *card, bool enable)

{

	u8 val = enable ? EXT_CSD_CMDQ_MODE_ENABLED : 0;