From: lintao <lintao@rock-chips.com>
Date: Thu, 4 Sep 2014 03:46:43 +0000 (+0800)
Subject: mmc: remove unused muti calc
X-Git-Tag: firefly_0821_release~4757^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d75e4f0a1a3109da3e73afa084e41b8b3f7f74a;p=firefly-linux-kernel-4.4.55.git

mmc: remove unused muti calc
---

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 0238bb94e86f..7e8d03653d22 100755
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -2756,22 +2756,20 @@ host_put:
 
 static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status)
 {
-        u32 multi, unit;
+        u32 multi, unit = SZ_2M;
 
         if (!host->cmd_status)
 	    host->cmd_status = status;
 	    
-	if(!host->cmd)
+        if (!host->cmd)
 		goto cmd_exit;
 
-	if((MMC_STOP_TRANSMISSION != host->cmd->opcode))
-        {
-                unit = 2*1024*1024;
-                multi = mci_readl(host, BYTCNT)/unit;
-                multi += ((mci_readl(host, BYTCNT) % unit) ? 1 :0 );
-                multi = (multi > 0) ? multi : 1;
-                multi += (host->cmd->retries > 2)? 2 : host->cmd->retries;
-                mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(4500 * multi));//max wait 8s larger
+        if ((MMC_STOP_TRANSMISSION != host->cmd->opcode)) {
+                multi = (mci_readl(host, BYTCNT) / unit) +
+                        ((mci_readl(host, BYTCNT) % unit) ? 1 :0 ) +
+                        ((host->cmd->retries > 2) ? 2 : host->cmd->retries);
+                /* Max limit time: 8s for dto */
+                mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(4000 * multi));
         }
 
 cmd_exit: