diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-23 19:18:27 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-23 19:18:27 +0300 |
| commit | 188933ac139a6f8ab06cad369bd0200af947b00d (patch) | |
| tree | c4c107528fcf6b82e32a93b0596e13eea7aa9385 /drivers/media/dvb-frontends/rtl2830_priv.h | |
| parent | 4ed0e032c3cf27c6fabc154164d003c4e0ac4654 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| download | linux-188933ac139a6f8ab06cad369bd0200af947b00d.tar.xz | |
Merge tag 'v4.0-rc5' into next
Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.
Conflicts:
drivers/input/mouse/synaptics.c
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2830_priv.h')
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2830_priv.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/media/dvb-frontends/rtl2830_priv.h b/drivers/media/dvb-frontends/rtl2830_priv.h index fab10ecb3c3b..d50d5376c9c5 100644 --- a/drivers/media/dvb-frontends/rtl2830_priv.h +++ b/drivers/media/dvb-frontends/rtl2830_priv.h @@ -13,9 +13,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef RTL2830_PRIV_H @@ -24,16 +21,23 @@ #include "dvb_frontend.h" #include "dvb_math.h" #include "rtl2830.h" +#include <linux/i2c-mux.h> +#include <linux/math64.h> +#include <linux/regmap.h> -struct rtl2830_priv { - struct i2c_adapter *i2c; +struct rtl2830_dev { + struct rtl2830_platform_data *pdata; + struct i2c_client *client; + struct regmap *regmap; + struct i2c_adapter *adapter; struct dvb_frontend fe; - struct rtl2830_config cfg; - struct i2c_adapter tuner_i2c_adapter; - bool sleeping; - - u8 page; /* active register page */ + unsigned long filters; + struct delayed_work stat_work; + fe_status_t fe_status; + u64 post_bit_error_prev; /* for old DVBv3 read_ber() calculation */ + u64 post_bit_error; + u64 post_bit_count; }; struct rtl2830_reg_val_mask { |