Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0faeee5 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13112): tda18271: display some state information in debug output 



Display i2c adapter id, address and master / slave role in debug output.

Signed-off-by: default avatarMichael Krufky <mkrufky@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3a6b49fe

drivers/media/common/tuners/tda18271-maps.c

+1 −0
Original line number Diff line number Diff line
@@ -978,6 +978,7 @@ static struct tda18271_cid_target_map tda18271_cid_target[] = { 
int tda18271_lookup_cid_target(struct dvb_frontend *fe,

			       u32 *freq, u8 *cid_target, u16 *count_limit)

{

	struct tda18271_priv *priv = fe->tuner_priv;

	int i = 0;



	while ((tda18271_cid_target[i].rfmax * 1000) < *freq) {

drivers/media/common/tuners/tda18271-priv.h

+22 −12
Original line number Diff line number Diff line
@@ -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;								     \

})