[media] rtl28xxu: rename state variable 'priv' to 'dev'

[firefly-linux-kernel-4.4.55.git] / drivers / media / usb / dvb-usb-v2 / rtl28xxu.h

diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
index 3e3ea9d64a38e8a818ad4230cfc589a2711d62b5..abf0111a3fdacee63a2e114efcbeb766918a85f5 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -22,8 +22,26 @@
 #ifndef RTL28XXU_H
 #define RTL28XXU_H
 
+#include <linux/platform_device.h>
+
 #include "dvb_usb.h"
 
+#include "rtl2830.h"
+#include "rtl2832.h"
+#include "rtl2832_sdr.h"
+#include "mn88472.h"
+#include "mn88473.h"
+
+#include "qt1010.h"
+#include "mt2060.h"
+#include "mxl5005s.h"
+#include "fc0012.h"
+#include "fc0013.h"
+#include "e4000.h"
+#include "fc2580.h"
+#include "tua9001.h"
+#include "r820t.h"
+
 /*
  * USB commands
  * (usb_control_msg() index parameter)
@@ -50,19 +68,25 @@
 #define CMD_I2C_DA_WR    0x0610
 
 
-struct rtl28xxu_priv {
+struct rtl28xxu_dev {
        u8 chip_id;
        u8 tuner;
        char *tuner_name;
        u8 page; /* integrated demod active register page */
        struct i2c_adapter *demod_i2c_adapter;
        bool rc_active;
+       struct i2c_client *i2c_client_demod;
        struct i2c_client *i2c_client_tuner;
        struct i2c_client *i2c_client_slave_demod;
+       struct platform_device *platform_device_sdr;
        #define SLAVE_DEMOD_NONE           0
        #define SLAVE_DEMOD_MN88472        1
        #define SLAVE_DEMOD_MN88473        2
        unsigned int slave_demod:2;
+       union {
+               struct rtl2830_platform_data rtl2830_platform_data;
+               struct rtl2832_platform_data rtl2832_platform_data;
+       };
 };
 
 enum rtl28xxu_chip_id {