[media] rc: img-ir: hw: Fix min/max bits setup
authorJames Hogan <james.hogan@imgtec.com>
Thu, 13 Mar 2014 10:29:22 +0000 (07:29 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 14 Mar 2014 12:49:45 +0000 (09:49 -0300)
The calculated values for the minlen and maxlen fields, which were
rounded to multiples of 2 and clamped to a valid range, were left
unused. Use them in the calculation of the register value rather than
using the raw input minlen and maxlen.

This fixes the following warning with a W=1 build:
drivers/media/rc/img-ir/img-ir-hw.c In function ‘img_ir_free_timing’:
drivers/media/rc/img-ir/img-ir-hw.c +228 :23: warning: variable ‘maxlen’ set but not used [-Wunused-but-set-variable]
drivers/media/rc/img-ir/img-ir-hw.c +228 :15: warning: variable ‘minlen’ set but not used [-Wunused-but-set-variable]

Reported-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/rc/img-ir/img-ir-hw.c

index 2abf78a89fc572c16792c05e68bea9dac31d34ea..579a52b3edce1a883ad2f34e3d2d783d50fb750f 100644 (file)
@@ -240,9 +240,9 @@ static u32 img_ir_free_timing(const struct img_ir_free_timing *timing,
        ft_min = (timing->ft_min*clock_hz + 999999) / 1000000;
        ft_min = (ft_min + 7) >> 3;
        /* construct register value */
-       return  (timing->maxlen << IMG_IR_MAXLEN_SHIFT) |
-               (timing->minlen << IMG_IR_MINLEN_SHIFT) |
-               (ft_min         << IMG_IR_FT_MIN_SHIFT);
+       return  (maxlen << IMG_IR_MAXLEN_SHIFT) |
+               (minlen << IMG_IR_MINLEN_SHIFT) |
+               (ft_min << IMG_IR_FT_MIN_SHIFT);
 }
 
 /**