From: Dong Aisheng <aisheng.dong@nxp.com>
To: linux-mmc@vger.kernel.org
Cc: ulf.hansson@linaro.org, chris@printf.net, shawnguo@kernel.org,
adrian.hunter@intel.com, linux-arm-kernel@lists.infradead.org,
aisheng.dong@nxp.com, haibo.chen@nxp.com, dongas86@gmail.com
Subject: [PATCH 2/3] mmc: core: remove the invalid message in mmc_select_timing
Date: Thu, 21 Apr 2016 00:51:31 +0800 [thread overview]
Message-ID: <1461171092-30631-2-git-send-email-aisheng.dong@nxp.com> (raw)
In-Reply-To: <1461171092-30631-1-git-send-email-aisheng.dong@nxp.com>
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>
---
drivers/mmc/core/mmc.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index f6683a9..55c8201 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1321,21 +1321,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;
}
/*
--
1.9.1
next prev parent reply other threads:[~2016-04-20 16:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 16:51 [PATCH 1/3] mmc: core: fix using wrong io voltage if mmc_select_hs200 fails Dong Aisheng
2016-04-20 16:51 ` Dong Aisheng [this message]
2016-04-28 9:24 ` [PATCH 2/3] mmc: core: remove the invalid message in mmc_select_timing Ulf Hansson
2016-04-28 14:58 ` Dong Aisheng
2016-05-10 9:46 ` Ulf Hansson
2016-04-20 16:51 ` [PATCH 3/3] mmc: core: support hs speed mode if hs200 mode fails Dong Aisheng
2016-05-10 9:46 ` Ulf Hansson
2016-05-13 9:06 ` Marcel Ziswiler
2016-05-16 9:32 ` Ulf Hansson
[not found] ` <1463130397.3151.13.camel-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org>
2016-05-26 11:27 ` Dong Aisheng
2016-04-28 9:26 ` [PATCH 1/3] mmc: core: fix using wrong io voltage if mmc_select_hs200 fails Ulf Hansson
2016-05-10 9:46 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461171092-30631-2-git-send-email-aisheng.dong@nxp.com \
--to=aisheng.dong@nxp.com \
--cc=adrian.hunter@intel.com \
--cc=chris@printf.net \
--cc=dongas86@gmail.com \
--cc=haibo.chen@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=shawnguo@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).