summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2014-03-13 11:29:22 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-14 13:49:45 +0100
commitb9e28d1f8301d6e393b8937282f325f13fb9cf6a (patch)
tree38febef78bfda488950b5357f7560299d1ecc262
parent[media] rc: img-ir: jvc: Remove unused no-leader timings (diff)
downloadlinux-b9e28d1f8301d6e393b8937282f325f13fb9cf6a.tar.xz
linux-b9e28d1f8301d6e393b8937282f325f13fb9cf6a.zip
[media] rc: img-ir: hw: Fix min/max bits setup
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>
-rw-r--r--drivers/media/rc/img-ir/img-ir-hw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c
index 2abf78a89fc5..579a52b3edce 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.c
+++ b/drivers/media/rc/img-ir/img-ir-hw.c
@@ -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);
}
/**