Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / media / common / tuners / tda18271-priv.h

diff --git a/drivers/media/common/tuners/tda18271-priv.h b/drivers/media/common/tuners/tda18271-priv.h
index 74075be4dea3efe6b3a03d84d4f2597ba08d68bf..9589ab0576d2b90eb5b118cad9daa715ecaaf353 100644 (file)
--- a/drivers/media/common/tuners/tda18271-priv.h
+++ b/drivers/media/common/tuners/tda18271-priv.h
@@ -109,10 +109,10 @@ struct tda18271_priv {
        enum tda18271_i2c_gate gate;
        enum tda18271_ver id;
        enum tda18271_output_options output_opt;
+       enum tda18271_small_i2c small_i2c;
 
        unsigned int config; /* interface to saa713x / tda829x */
        unsigned int cal_initialized:1;
-       unsigned int small_i2c:1;
 
        u8 tm_rfcal;
 
@@ -136,27 +136,37 @@ extern int tda18271_debug;
 #define DBG_ADV  8
 #define DBG_CAL  16
 
-#define tda_printk(kern, fmt, arg...) \
-       printk(kern "%s: " fmt, __func__, ##arg)
-
-#define tda_dprintk(lvl, fmt, arg...) do {\
+#define tda_printk(st, kern, fmt, arg...) do {\
+       if (st) { \
+               struct tda18271_priv *state = st; \
+               printk(kern "%s: [%d-%04x|%s] " fmt, __func__, \
+                       i2c_adapter_id(state->i2c_props.adap), \
+                       state->i2c_props.addr, \
+                       (state->role == TDA18271_MASTER) \
+                       ? "M" : "S", ##arg); \
+       } else \
+               printk(kern "%s: " fmt, __func__, ##arg); \
+} while (0)
+
+#define tda_dprintk(st, lvl, fmt, arg...) do {\
        if (tda18271_debug & lvl) \
-               tda_printk(KERN_DEBUG, fmt, ##arg); } while (0)
+               tda_printk(st, KERN_DEBUG, fmt, ##arg); } while (0)
 
 #define tda_info(fmt, arg...)     printk(KERN_INFO     fmt, ##arg)
-#define tda_warn(fmt, arg...) tda_printk(KERN_WARNING, fmt, ##arg)
-#define tda_err(fmt, arg...)  tda_printk(KERN_ERR,     fmt, ##arg)
-#define tda_dbg(fmt, arg...)  tda_dprintk(DBG_INFO,    fmt, ##arg)
-#define tda_map(fmt, arg...)  tda_dprintk(DBG_MAP,     fmt, ##arg)
-#define tda_reg(fmt, arg...)  tda_dprintk(DBG_REG,     fmt, ##arg)
-#define tda_cal(fmt, arg...)  tda_dprintk(DBG_CAL,     fmt, ##arg)
+#define tda_warn(fmt, arg...) tda_printk(priv, KERN_WARNING, fmt, ##arg)
+#define tda_err(fmt, arg...)  tda_printk(priv, KERN_ERR,     fmt, ##arg)
+#define tda_dbg(fmt, arg...)  tda_dprintk(priv, DBG_INFO,    fmt, ##arg)
+#define tda_map(fmt, arg...)  tda_dprintk(priv, DBG_MAP,     fmt, ##arg)
+#define tda_reg(fmt, arg...)  tda_dprintk(priv, DBG_REG,     fmt, ##arg)
+#define tda_cal(fmt, arg...)  tda_dprintk(priv, DBG_CAL,     fmt, ##arg)
 
 #define tda_fail(ret)                                                       \
 ({                                                                          \
        int __ret;                                                           \
        __ret = (ret < 0);                                                   \
        if (__ret)                                                           \
-               tda_printk(KERN_ERR, "error %d on line %d\n", ret, __LINE__);\
+               tda_printk(priv, KERN_ERR,                                   \
+                          "error %d on line %d\n", ret, __LINE__);          \
        __ret;                                                               \
 })