mtd: rawnand: stm32_fmc2: avoid warnings when building with W=1 option

This patch solves warnings detected by setting W=1 when building.

Warnings type detected:
 - [-Wsign-compare]
 - [-Wtype-limits]

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 2bb749d7f73bde97ba58534d7d1c41bc56c9cb20..f3179cc21f521a5ce0de9a3c425f48c6ec18e4b2 100644 (file)
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -627,21 +627,16 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
        struct stm32_fmc2_timings *tims = &nand->timings;
        unsigned long hclk = clk_get_rate(&fmc2->clk);
        unsigned long hclkp = FMC2_NSEC_PER_SEC / (hclk / 1000);
-       int tar, tclr, thiz, twait, tset_mem, tset_att, thold_mem, thold_att;
-
-       tar = hclkp;
-       if (tar < sdrt->tAR_min)
-               tar = sdrt->tAR_min;
-       tims->tar = DIV_ROUND_UP(tar, hclkp) - 1;
-       if (tims->tar > FMC2_PCR_TIMING_MASK)
-               tims->tar = FMC2_PCR_TIMING_MASK;
-
-       tclr = hclkp;
-       if (tclr < sdrt->tCLR_min)
-               tclr = sdrt->tCLR_min;
-       tims->tclr = DIV_ROUND_UP(tclr, hclkp) - 1;
-       if (tims->tclr > FMC2_PCR_TIMING_MASK)
-               tims->tclr = FMC2_PCR_TIMING_MASK;
+       unsigned long timing, tar, tclr, thiz, twait;
+       unsigned long tset_mem, tset_att, thold_mem, thold_att;
+
+       tar = max_t(unsigned long, hclkp, sdrt->tAR_min);
+       timing = DIV_ROUND_UP(tar, hclkp) - 1;
+       tims->tar = min_t(unsigned long, timing, FMC2_PCR_TIMING_MASK);
+
+       tclr = max_t(unsigned long, hclkp, sdrt->tCLR_min);
+       timing = DIV_ROUND_UP(tclr, hclkp) - 1;
+       tims->tclr = min_t(unsigned long, timing, FMC2_PCR_TIMING_MASK);
 
        tims->thiz = FMC2_THIZ;
        thiz = (tims->thiz + 1) * hclkp;
@@ -651,18 +646,11 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
         * tWAIT > tWP
         * tWAIT > tREA + tIO
         */
-       twait = hclkp;
-       if (twait < sdrt->tRP_min)
-               twait = sdrt->tRP_min;
-       if (twait < sdrt->tWP_min)
-               twait = sdrt->tWP_min;
-       if (twait < sdrt->tREA_max + FMC2_TIO)
-               twait = sdrt->tREA_max + FMC2_TIO;
-       tims->twait = DIV_ROUND_UP(twait, hclkp);
-       if (tims->twait == 0)
-               tims->twait = 1;
-       else if (tims->twait > FMC2_PMEM_PATT_TIMING_MASK)
-               tims->twait = FMC2_PMEM_PATT_TIMING_MASK;
+       twait = max_t(unsigned long, hclkp, sdrt->tRP_min);
+       twait = max_t(unsigned long, twait, sdrt->tWP_min);
+       twait = max_t(unsigned long, twait, sdrt->tREA_max + FMC2_TIO);
+       timing = DIV_ROUND_UP(twait, hclkp);
+       tims->twait = clamp_val(timing, 1, FMC2_PMEM_PATT_TIMING_MASK);
 
        /*
         * tSETUP_MEM > tCS - tWAIT
@@ -677,20 +665,15 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
        if (twait > thiz && (sdrt->tDS_min > twait - thiz) &&
            (tset_mem < sdrt->tDS_min - (twait - thiz)))
                tset_mem = sdrt->tDS_min - (twait - thiz);
-       tims->tset_mem = DIV_ROUND_UP(tset_mem, hclkp);
-       if (tims->tset_mem == 0)
-               tims->tset_mem = 1;
-       else if (tims->tset_mem > FMC2_PMEM_PATT_TIMING_MASK)
-               tims->tset_mem = FMC2_PMEM_PATT_TIMING_MASK;
+       timing = DIV_ROUND_UP(tset_mem, hclkp);
+       tims->tset_mem = clamp_val(timing, 1, FMC2_PMEM_PATT_TIMING_MASK);
 
        /*
         * tHOLD_MEM > tCH
         * tHOLD_MEM > tREH - tSETUP_MEM
         * tHOLD_MEM > max(tRC, tWC) - (tSETUP_MEM + tWAIT)
         */
-       thold_mem = hclkp;
-       if (thold_mem < sdrt->tCH_min)
-               thold_mem = sdrt->tCH_min;
+       thold_mem = max_t(unsigned long, hclkp, sdrt->tCH_min);
        if (sdrt->tREH_min > tset_mem &&
            (thold_mem < sdrt->tREH_min - tset_mem))
                thold_mem = sdrt->tREH_min - tset_mem;
@@ -700,11 +683,8 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
        if ((sdrt->tWC_min > tset_mem + twait) &&
            (thold_mem < sdrt->tWC_min - (tset_mem + twait)))
                thold_mem = sdrt->tWC_min - (tset_mem + twait);
-       tims->thold_mem = DIV_ROUND_UP(thold_mem, hclkp);
-       if (tims->thold_mem == 0)
-               tims->thold_mem = 1;
-       else if (tims->thold_mem > FMC2_PMEM_PATT_TIMING_MASK)
-               tims->thold_mem = FMC2_PMEM_PATT_TIMING_MASK;
+       timing = DIV_ROUND_UP(thold_mem, hclkp);
+       tims->thold_mem = clamp_val(timing, 1, FMC2_PMEM_PATT_TIMING_MASK);
 
        /*
         * tSETUP_ATT > tCS - tWAIT
@@ -726,11 +706,8 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
        if (twait > thiz && (sdrt->tDS_min > twait - thiz) &&
            (tset_att < sdrt->tDS_min - (twait - thiz)))
                tset_att = sdrt->tDS_min - (twait - thiz);
-       tims->tset_att = DIV_ROUND_UP(tset_att, hclkp);
-       if (tims->tset_att == 0)
-               tims->tset_att = 1;
-       else if (tims->tset_att > FMC2_PMEM_PATT_TIMING_MASK)
-               tims->tset_att = FMC2_PMEM_PATT_TIMING_MASK;
+       timing = DIV_ROUND_UP(tset_att, hclkp);
+       tims->tset_att = clamp_val(timing, 1, FMC2_PMEM_PATT_TIMING_MASK);
 
        /*
         * tHOLD_ATT > tALH
@@ -745,17 +722,11 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
         * tHOLD_ATT > tRC - (tSETUP_ATT + tWAIT)
         * tHOLD_ATT > tWC - (tSETUP_ATT + tWAIT)
         */
-       thold_att = hclkp;
-       if (thold_att < sdrt->tALH_min)
-               thold_att = sdrt->tALH_min;
-       if (thold_att < sdrt->tCH_min)
-               thold_att = sdrt->tCH_min;
-       if (thold_att < sdrt->tCLH_min)
-               thold_att = sdrt->tCLH_min;
-       if (thold_att < sdrt->tCOH_min)
-               thold_att = sdrt->tCOH_min;
-       if (thold_att < sdrt->tDH_min)
-               thold_att = sdrt->tDH_min;
+       thold_att = max_t(unsigned long, hclkp, sdrt->tALH_min);
+       thold_att = max_t(unsigned long, thold_att, sdrt->tCH_min);
+       thold_att = max_t(unsigned long, thold_att, sdrt->tCLH_min);
+       thold_att = max_t(unsigned long, thold_att, sdrt->tCOH_min);
+       thold_att = max_t(unsigned long, thold_att, sdrt->tDH_min);
        if ((sdrt->tWB_max + FMC2_TIO + FMC2_TSYNC > tset_mem) &&
            (thold_att < sdrt->tWB_max + FMC2_TIO + FMC2_TSYNC - tset_mem))
                thold_att = sdrt->tWB_max + FMC2_TIO + FMC2_TSYNC - tset_mem;
@@ -774,11 +745,8 @@ static void stm32_fmc2_calc_timings(struct nand_chip *chip,
        if ((sdrt->tWC_min > tset_att + twait) &&
            (thold_att < sdrt->tWC_min - (tset_att + twait)))
                thold_att = sdrt->tWC_min - (tset_att + twait);
-       tims->thold_att = DIV_ROUND_UP(thold_att, hclkp);
-       if (tims->thold_att == 0)
-               tims->thold_att = 1;
-       else if (tims->thold_att > FMC2_PMEM_PATT_TIMING_MASK)
-               tims->thold_att = FMC2_PMEM_PATT_TIMING_MASK;
+       timing = DIV_ROUND_UP(thold_att, hclkp);
+       tims->thold_att = clamp_val(timing, 1, FMC2_PMEM_PATT_TIMING_MASK);
 }
 
 static int stm32_fmc2_setup_interface(struct mtd_info *mtd, int chipnr,
@@ -932,7 +900,8 @@ static int stm32_fmc2_probe(struct udevice *dev)
        struct nand_ecclayout *ecclayout;
        struct resource resource;
        struct reset_ctl reset;
-       int oob_index, chip_cs, mem_region, ret, i;
+       int oob_index, chip_cs, mem_region, ret;
+       unsigned int i;
 
        spin_lock_init(&fmc2->controller.lock);
        init_waitqueue_head(&fmc2->controller.wq);