Commit 99b4ddd8 authored Oct 10, 2019 by Ulf Hansson

mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan()



Upfront in mmc_rescan() we use the host->rescan_entered flag, to allow
scanning only once for non-removable cards. Therefore, it's also not
possible that we can have a corresponding card bus attached (host->bus_ops
is NULL), when we are scanning non-removable cards.

For this reason, let' drop the check for mmc_card_is_removable() as it's
redundant.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Douglas Anderson <dianders@chromium.org>
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent cdb2256f

drivers/mmc/core/core.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2297,11 +2297,8 @@ void mmc_rescan(struct work_struct *work)

		mmc_bus_get(host);

		/*
		* if there is a _removable_ card registered, check whether it is
		* still present
		*/
		if (host->bus_ops && !host->bus_dead && mmc_card_is_removable(host))
		/* Verify a registered card to be functional, else remove it. */
		if (host->bus_ops && !host->bus_dead)
		host->bus_ops->detect(host);

		host->detect_change = 0;

Admin message