[media] cobalt: fix 64-bit division

There are still some 64-bit division problems in the cobalt code.
Replace it by div_u64.

[mchehab@osg.samsung.com: folded with an additional diff sent by
 Hans via a priv e-mail]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/cobalt/cobalt-cpld.c b/drivers/media/pci/cobalt/cobalt-cpld.c
index 5a28d9b28dc916059707f77d66339d580e7f7550..e83f5c9f7e7df09b9e731277a60303eb76ed4c97 100644 (file)
--- a/drivers/media/pci/cobalt/cobalt-cpld.c
+++ b/drivers/media/pci/cobalt/cobalt-cpld.c
@@ -240,8 +240,8 @@ static const struct multiplier multipliers[] = {
 bool cobalt_cpld_set_freq(struct cobalt *cobalt, unsigned f_out)
 {
        const unsigned f_xtal = 39170000;       /* xtal for si598 */
-       unsigned long long dco;
-       unsigned long long rfreq;
+       u64 dco;
+       u64 rfreq;
        unsigned delta = 0xffffffff;
        unsigned i_best = 0;
        unsigned i;
@@ -253,12 +253,12 @@ bool cobalt_cpld_set_freq(struct cobalt *cobalt, unsigned f_out)
 
        for (i = 0; i < ARRAY_SIZE(multipliers); i++) {
                unsigned mult = multipliers[i].mult;
-               unsigned d;
+               u32 d;
 
-               dco = (unsigned long long)f_out * mult;
+               dco = (u64)f_out * mult;
                if (dco < DCO_MIN || dco > DCO_MAX)
                        continue;
-               d = ((dco << 28) + f_xtal / 2) % f_xtal;
+               div_u64_rem((dco << 28) + f_xtal / 2, f_xtal, &d);
                if (d < delta) {
                        found = 1;
                        i_best = i;
@@ -267,10 +267,10 @@ bool cobalt_cpld_set_freq(struct cobalt *cobalt, unsigned f_out)
        }
        if (!found)
                return false;
-       dco = (unsigned long long)f_out * multipliers[i_best].mult;
+       dco = (u64)f_out * multipliers[i_best].mult;
        n1 = multipliers[i_best].n1 - 1;
        hsdiv = multipliers[i_best].hsdiv - 4;
-       rfreq = (dco << 28) / f_xtal;
+       rfreq = div_u64(dco << 28, f_xtal);
 
        clock_ctrl = cpld_read(cobalt, SI570_CLOCK_CTRL);
        clock_ctrl |= S01755_REG_CLOCK_CTRL_BITMAP_CLKHSMA_FPGA_CTRL;

diff --git a/drivers/media/pci/cobalt/cobalt-v4l2.c b/drivers/media/pci/cobalt/cobalt-v4l2.c
index 6fb8812990f4c911f16e32082ff8106a2acb0019..b40c2d141b582b42dd62321cd3799d2bdf5a2c1d 100644 (file)
--- a/drivers/media/pci/cobalt/cobalt-v4l2.c
+++ b/drivers/media/pci/cobalt/cobalt-v4l2.c
@@ -327,7 +327,7 @@ static int cobalt_start_streaming(struct vb2_queue *q, unsigned int count)
        iowrite32(clk_freq / 1000000, &clkloss->ref_clk_cnt_val);
        /* The lower bound for the clock frequency is 0.5% lower as is
         * allowed by the spec */
-       iowrite32((((u64)bt->pixelclock * 995) / 1000) / 1000000,
+       iowrite32(div_u64(bt->pixelclock * 995, 1000000000),
                  &clkloss->test_clk_cnt_val);
        /* will be enabled after the first frame has been received */
        iowrite32(bt->width * bt->height, &fw->active_length);