]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mmc: core: remove the invalid message in mmc_select_timing
authorDong Aisheng <aisheng.dong@nxp.com>
Wed, 20 Apr 2016 16:51:31 +0000 (00:51 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 10 May 2016 08:37:59 +0000 (10:37 +0200)
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

index e0c9a559c5fd162918e6e21ec9361318367a0429..35873d4cc4426e52a19130040be6571bad096a73 100644 (file)
@@ -1320,21 +1320,13 @@ static int mmc_select_timing(struct mmc_card *card)
        if (err && err != -EBADMSG)
                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:
        /*
         * Set the bus speed to the selected bus timing.
         * If timing is not selected, backward compatible is the default.
         */
        mmc_set_bus_speed(card);
-       return err;
+       return 0;
 }
 
 /*