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 84f39a59a28e654d9c952b7548cdf594480a32a2..6249c83d616f365737b23011545edc336851177f 100644 (file)
--- 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;
 }