The JVC timings included timings intended for the secondary decoder
(which matches messages with no leader), however they were in the wrong
part of the timings structure, repeating s00 and s01 rather than being
in s10 and s11.
Distinct repeat timings can't be properly supported yet for JVC anyway
since the scancode callback cannot determine which decoder matched the
message, so for now remove these timings and don't bother to enable the
secondary decoder.
This fixes the following warnings with W=1:
drivers/media/rc/img-ir/img-ir-jvc.c +76 :3: warning: initialized field overwritten [-Woverride-init]
drivers/media/rc/img-ir/img-ir-jvc.c +76 :3: warning: (near initialization for ‘img_ir_jvc.timings.s00’) [-Woverride-init]
drivers/media/rc/img-ir/img-ir-jvc.c +81 :3: warning: initialized field overwritten [-Woverride-init]
drivers/media/rc/img-ir/img-ir-jvc.c +81 :3: warning: (near initialization for ‘img_ir_jvc.timings.s01’) [-Woverride-init]
Reported-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
---
I don't object to this patch being squashed into the patch "rc: img-ir:
add JVC decoder module".
---
drivers/media/rc/img-ir/img-ir-jvc.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/media/rc/img-ir/img-ir-jvc.c b/drivers/media/rc/img-ir/img-ir-jvc.c
index ae55867f6c5c..10209d200efb 100644
--- a/drivers/media/rc/img-ir/img-ir-jvc.c
+++ b/drivers/media/rc/img-ir/img-ir-jvc.c
@@ -49,7 +49,6 @@ struct img_ir_decoder img_ir_jvc = {
.control = {
.decoden = 1,
.code_type = IMG_IR_CODETYPE_PULSEDIST,
- .decodend2 = 1,
},
/* main timings */
.unit = 527500, /* 527.5 us */
@@ -69,16 +68,6 @@ struct img_ir_decoder img_ir_jvc = {
.pulse = { 1 /* 527.5 us +-60 us */ },
.space = { 3 /* 1.5825 ms +-40 us */ },
},
- /* 0 symbol (no leader) */
- .s00 = {
- .pulse = { 1 /* 527.5 us +-60 us */ },
- .space = { 1 /* 527.5 us */ },
- },
- /* 1 symbol (no leader) */
- .s01 = {
- .pulse = { 1 /* 527.5 us +-60 us */ },
- .space = { 3 /* 1.5825 ms +-40 us */ },
- },
/* free time */
.ft = {
.minlen = 16,
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
