mmc: omap_hsmmc: split duplicate code to calc_divisor() function

There are two places where the same calculations are done.
Let's split them into a separate function.

In addition, simplify by using the DIV_ROUND_UP kernel macro.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b0b52ced45540f36a4525b8f44859a7849a140d9..2840c7af02c292f0af6f34dfb20fc96f3230bd27 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/interrupt.h>
@@ -588,6 +589,20 @@ static void omap_hsmmc_disable_irq(struct omap_hsmmc_host *host)
        OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
 }
 
+/* Calculate divisor for the given clock frequency */
+static u16 calc_divisor(struct mmc_ios *ios)
+{
+       u16 dsor = 0;
+
+       if (ios->clock) {
+               dsor = DIV_ROUND_UP(OMAP_MMC_MASTER_CLOCK, ios->clock);
+               if (dsor > 250)
+                       dsor = 250;
+       }
+
+       return dsor;
+}
+
 #ifdef CONFIG_PM
 
 /*
@@ -600,7 +615,6 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
        struct omap_mmc_platform_data *pdata = host->pdata;
        int context_loss = 0;
        u32 hctl, capa, con;
-       u16 dsor = 0;
        unsigned long timeout;
 
        if (pdata->get_context_loss_count) {
@@ -679,21 +693,10 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
                break;
        }
 
-       if (ios->clock) {
-               dsor = OMAP_MMC_MASTER_CLOCK / ios->clock;
-               if (dsor < 1)
-                       dsor = 1;
-
-               if (OMAP_MMC_MASTER_CLOCK / dsor > ios->clock)
-                       dsor++;
-
-               if (dsor > 250)
-                       dsor = 250;
-       }
-
        OMAP_HSMMC_WRITE(host->base, SYSCTL,
                OMAP_HSMMC_READ(host->base, SYSCTL) & ~CEN);
-       OMAP_HSMMC_WRITE(host->base, SYSCTL, (dsor << 6) | (DTO << 16));
+       OMAP_HSMMC_WRITE(host->base, SYSCTL,
+               (calc_divisor(ios) << 6) | (DTO << 16));
        OMAP_HSMMC_WRITE(host->base, SYSCTL,
                OMAP_HSMMC_READ(host->base, SYSCTL) | ICE);
 
@@ -1603,7 +1606,6 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
 static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
        struct omap_hsmmc_host *host = mmc_priv(mmc);
-       u16 dsor = 0;
        unsigned long regval;
        unsigned long timeout;
        u32 con;
@@ -1667,21 +1669,11 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                }
        }
 
-       if (ios->clock) {
-               dsor = OMAP_MMC_MASTER_CLOCK / ios->clock;
-               if (dsor < 1)
-                       dsor = 1;
-
-               if (OMAP_MMC_MASTER_CLOCK / dsor > ios->clock)
-                       dsor++;
-
-               if (dsor > 250)
-                       dsor = 250;
-       }
        omap_hsmmc_stop_clock(host);
+
        regval = OMAP_HSMMC_READ(host->base, SYSCTL);
        regval = regval & ~(CLKD_MASK);
-       regval = regval | (dsor << 6) | (DTO << 16);
+       regval = regval | (calc_divisor(ios) << 6) | (DTO << 16);
        OMAP_HSMMC_WRITE(host->base, SYSCTL, regval);
        OMAP_HSMMC_WRITE(host->base, SYSCTL,
                OMAP_HSMMC_READ(host->base, SYSCTL) | ICE);