[linux-yocto] [PATCH 1/2] mmc: sdhci: Use DBG() instead of pr_warning() on large timeout

[Darren Hart]

From: Chris Ball <cjb at laptop.org>

commit 09eeff52bf20d485bcafc441f01c142c59c3da16 upstream.

3bdc9ba892d6 ("mmc: use really long write timeout to deal with crappy
cards") in 3.4 increased the write timeout that the core sends to host
drivers to 3 seconds.  This makes sdhci's "requested timeout too large"
warning trigger on every write; so, change this pr_warning() to a DBG().

Reported-by: Adrian Hunter <adrian.hunter at intel.com>
Signed-off-by: Chris Ball <cjb at laptop.org>

Backported to 3.4.11

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 drivers/mmc/host/sdhci.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 3c403aa..52b79ea 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -681,8 +681,10 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
 	}
 
 	if (count >= 0xF) {
-		pr_warning("%s: Too large timeout requested for CMD%d!\n",
-		       mmc_hostname(host->mmc), cmd->opcode);
+		DBG("%s: Too large timeout requested for CMD%d!\n",
+		    mmc_hostname(host->mmc), cmd->opcode);
+		DBG("%s: Too large timeout 0x%x requested for CMD%d!\n",
+		    mmc_hostname(host->mmc), count, cmd->opcode);
 		count = 0xE;
 	}
 
-- 
1.7.5.4