[media] rc-core: merge rc5 and streamzap decoders

[firefly-linux-kernel-4.4.55.git] / drivers / media / rc / rc-core-priv.h

diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index da536c93c978b7645c4e90b9151c46fd95f6a318..dea7aff15a35d1ce22a637e072e155610e863c19 100644 (file)
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -54,7 +54,7 @@ struct ir_raw_event_ctrl {
                int state;
                u32 bits;
                unsigned count;
-               unsigned wanted_bits;
+               bool is_rc5x;
        } rc5;
        struct rc6_dec {
                int state;
@@ -77,12 +77,6 @@ struct ir_raw_event_ctrl {
                bool first;
                bool toggle;
        } jvc;
-       struct rc5_sz_dec {
-               int state;
-               u32 bits;
-               unsigned count;
-               unsigned wanted_bits;
-       } rc5_sz;
        struct sanyo_dec {
                int state;
                unsigned count;