mmc: core: remove the invalid message in mmc_select_timing (0400ed0a) · Commits · e / devices / android_kernel_xiaomi_nabu

mmc_select_hs200() and mmc_select_hs() will keep the timing as before if switch fails. So it's meaningless to print the failed switched mode outside based on the current host timing. Furthermore, the original print is wrong, it should be: pr_warn("%s: switch to %s failed\n", mmc_hostname(card->host), mmc_card_hs(card) ? "high-speed" : (mmc_card_hs200(card) ? "hs200" : "")); Since we already have error message in mmc_select_hs200(), simply remove it outside. Signed-off-by:

Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/core/mmc.c

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1320,21 +1320,13 @@ static int mmc_select_timing(struct mmc_card *card)
	if (err && err != -EBADMSG)		if (err && err != -EBADMSG)
	return err;		return err;

	if (err) {
	pr_warn("%s: switch to %s failed\n",
	mmc_card_hs(card) ? "high-speed" :
	(mmc_card_hs200(card) ? "hs200" : ""),
	mmc_hostname(card->host));
	err = 0;
	}

	bus_speed:		bus_speed:
	/*		/*
	* Set the bus speed to the selected bus timing.		* Set the bus speed to the selected bus timing.
	* If timing is not selected, backward compatible is the default.		* If timing is not selected, backward compatible is the default.
	*/		*/
	mmc_set_bus_speed(card);		mmc_set_bus_speed(card);
	return err;		return 0;
	}		}

	/*		/*