From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Wed, 30 Jun 2021 04:16:58 +0000 (+0200)
Subject: mmc: core: Only print retune error when we don't check for card removal
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8335928849729f8e5f10c1497c67260742f7a8cb;p=linux.git

mmc: core: Only print retune error when we don't check for card removal

Skip printing a retune error when we scan for a removed card because we
then expect a failed command.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20210630041658.7574-1-wsa+renesas@sang-engineering.com
[Ulf: Rebased patch]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 84f39a59a28e6..6249c83d616f3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -936,15 +936,17 @@ int mmc_execute_tuning(struct mmc_card *card)
 		opcode = MMC_SEND_TUNING_BLOCK;
 
 	err = host->ops->execute_tuning(host, opcode);
-
-	if (err) {
-		pr_err("%s: tuning execution failed: %d\n",
-			mmc_hostname(host), err);
-	} else {
+	if (!err) {
 		mmc_retune_clear(host);
 		mmc_retune_enable(host);
+		return 0;
 	}
 
+	/* Only print error when we don't check for card removal */
+	if (!host->detect_change)
+		pr_err("%s: tuning execution failed: %d\n",
+			mmc_hostname(host), err);
+
 	return err;
 }