Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / tda10071_priv.h

diff --git a/drivers/media/dvb-frontends/tda10071_priv.h b/drivers/media/dvb-frontends/tda10071_priv.h
index 30143c8f8bb83e5ef069267c3f4fe798200cb12e..b9c3601802bab6f2c2f81bd458387dc9d24a4b03 100644 (file)
--- a/drivers/media/dvb-frontends/tda10071_priv.h
+++ b/drivers/media/dvb-frontends/tda10071_priv.h
@@ -30,6 +30,7 @@ struct tda10071_dev {
        struct dvb_frontend fe;
        struct i2c_client *client;
        struct regmap *regmap;
+       struct mutex cmd_execute_mutex;
        u32 clk;
        u16 i2c_wr_max;
        u8 ts_mode;
@@ -37,12 +38,13 @@ struct tda10071_dev {
        u8 pll_multiplier;
        u8 tuner_i2c_addr;
 
-       u8 meas_count[2];
-       u32 ber;
-       u32 ucb;
+       u8 meas_count;
+       u32 dvbv3_ber;
        enum fe_status fe_status;
        enum fe_delivery_system delivery_system;
        bool warm; /* FW running */
+       u64 post_bit_error;
+       u64 block_error;
 };
 
 static struct tda10071_modcod {