rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / atmel-mci.c

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index b6cd3867f72321f5b639fac700bd07491f334852..aa8039f473c485ad4fcbe7d9c5f5f16fcf6f3e25 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -468,14 +468,7 @@ err:
 static inline unsigned int ns_to_clocks(struct atmel_mci *host,
                                        unsigned int ns)
 {
-       /*
-        * It is easier here to use us instead of ns for the timeout,
-        * it prevents from overflows during calculation.
-        */
-       unsigned int us = DIV_ROUND_UP(ns, 1000);
-
-       /* Maximum clock frequency is host->bus_hz/2 */
-       return us * (DIV_ROUND_UP(host->bus_hz, 2000000));
+       return (ns * (host->bus_hz / 1000000) + 999) / 1000;
 }
 
 static void atmci_set_timeout(struct atmel_mci *host,