V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences

[cascardo/linux.git] / drivers / media / dvb / frontends / tda18271-priv.h

diff --git a/drivers/media/dvb/frontends/tda18271-priv.h b/drivers/media/dvb/frontends/tda18271-priv.h
index b4d1ab7..2bc5eb3 100644 (file)
--- a/drivers/media/dvb/frontends/tda18271-priv.h
+++ b/drivers/media/dvb/frontends/tda18271-priv.h
@@ -23,6 +23,8 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/mutex.h>
+#include "tuner-i2c.h"
 #include "tda18271.h"
 
 #define R_ID     0x00  /* ID byte                */
@@ -84,6 +86,11 @@ struct tda18271_rf_tracking_filter_cal {
        int rf_b2;
 };
 
+enum tda18271_pll {
+       TDA18271_MAIN_PLL,
+       TDA18271_CAL_PLL,
+};
+
 enum tda18271_mode {
        TDA18271_ANALOG,
        TDA18271_DIGITAL,
@@ -97,21 +104,26 @@ enum tda18271_ver {
 };
 
 struct tda18271_priv {
-       u8 i2c_addr;
-       struct i2c_adapter *i2c_adap;
        unsigned char tda18271_regs[TDA18271_NUM_REGS];
 
+       struct list_head        hybrid_tuner_instance_list;
+       struct tuner_i2c_props  i2c_props;
+
        enum tda18271_mode mode;
+       enum tda18271_role role;
        enum tda18271_i2c_gate gate;
        enum tda18271_ver id;
 
        unsigned int tm_rfcal;
        unsigned int cal_initialized:1;
+       unsigned int small_i2c:1;
 
        struct tda18271_map_layout *maps;
        struct tda18271_std_map std;
        struct tda18271_rf_tracking_filter_cal rf_cal_state[8];
 
+       struct mutex lock;
+
        u32 frequency;
        u32 bandwidth;
 };
@@ -124,9 +136,10 @@ extern int tda18271_debug;
 #define DBG_MAP  2
 #define DBG_REG  4
 #define DBG_ADV  8
+#define DBG_CAL  16
 
 #define tda_printk(kern, fmt, arg...) \
-       printk(kern "%s: " fmt, __FUNCTION__, ##arg)
+       printk(kern "%s: " fmt, __func__, ##arg)
 
 #define dprintk(kern, lvl, fmt, arg...) do {\
        if (tda18271_debug & lvl) \
@@ -138,6 +151,7 @@ extern int tda18271_debug;
 #define tda_dbg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_INFO, fmt, ##arg)
 #define tda_map(fmt, arg...)  dprintk(KERN_DEBUG, DBG_MAP,  fmt, ##arg)
 #define tda_reg(fmt, arg...)  dprintk(KERN_DEBUG, DBG_REG,  fmt, ##arg)
+#define tda_cal(fmt, arg...)  dprintk(KERN_DEBUG, DBG_CAL,  fmt, ##arg)
 
 /*---------------------------------------------------------------------*/
 
@@ -180,6 +194,11 @@ extern int tda18271_read_extended(struct dvb_frontend *fe);
 extern int tda18271_write_regs(struct dvb_frontend *fe, int idx, int len);
 extern int tda18271_init_regs(struct dvb_frontend *fe);
 
+extern int tda18271_charge_pump_source(struct dvb_frontend *fe,
+                                      enum tda18271_pll pll, int force);
+extern int tda18271_set_standby_mode(struct dvb_frontend *fe,
+                                    int sm, int sm_lt, int sm_xt);
+
 extern int tda18271_calc_main_pll(struct dvb_frontend *fe, u32 freq);
 extern int tda18271_calc_cal_pll(struct dvb_frontend *fe, u32 freq);