Commit 1ff2575b authored Nov 05, 2015 by Ulf Hansson

mmc: core: Check for non-removable cards earlier in the error path



_mmc_detect_card_removed() validates that the card is removable, but when
being called via the bus_ops ->detect() callbacks, the validation is
redundant as it's already done in mmc_rescan().

Move the validation of a removable card to the mmc_detect_card_removed()
API, which is where it's applicable, to allow the blk error recovery path
to get the response a bit earlier.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 8dede18e

drivers/mmc/core/core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2498,9 +2498,6 @@ int _mmc_detect_card_removed(struct mmc_host *host)
		{
		int ret;

		if (host->caps & MMC_CAP_NONREMOVABLE)
		return 0;

		if (!host->card \|\| mmc_card_removed(host->card))
		return 1;

		@@ -2536,6 +2533,9 @@ int mmc_detect_card_removed(struct mmc_host *host)
		if (!card)
		return 1;

		if (host->caps & MMC_CAP_NONREMOVABLE)
		return 0;

		ret = mmc_card_removed(card);
		/*
		* The card will be considered unchanged unless we have been asked to