V4L/DVB (7135): remove PREFIX from users of tuner_foo printk macros
Store a pointer to the device name in the name field of struct tuner_i2c_props, so that we can remove the printk macros defined in tuner-i2c.h Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
3c2a0865d0
commit
2756665c28
drivers/media/video
@ -14,8 +14,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "mt20xx"
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
static unsigned int optimize_vco = 1;
|
||||
@ -611,6 +609,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "mt20xx";
|
||||
|
||||
//priv->radio_if2 = 10700 * 1000; /* 10.7MHz - FM radio */
|
||||
|
||||
|
@ -32,8 +32,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "tda8290"
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
struct tda8290_priv {
|
||||
@ -674,6 +672,7 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "tda829x";
|
||||
if (cfg) {
|
||||
priv->cfg.config = cfg->lna_cfg;
|
||||
priv->cfg.tuner_callback = cfg->tuner_callback;
|
||||
|
@ -25,8 +25,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "tda9887"
|
||||
|
||||
struct tda9887_priv {
|
||||
struct tuner_i2c_props i2c_props;
|
||||
|
||||
@ -673,6 +671,7 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "tda9887";
|
||||
priv->mode = T_STANDBY;
|
||||
|
||||
tuner_info("tda988[5/6/7] found\n");
|
||||
|
@ -18,8 +18,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "tea5761"
|
||||
|
||||
struct tea5761_priv {
|
||||
struct tuner_i2c_props i2c_props;
|
||||
|
||||
@ -131,7 +129,7 @@ static void tea5761_status_dump(unsigned char *buffer)
|
||||
|
||||
frq = 1000 * (div * 32768 / 1000 + FREQ_OFFSET + 225) / 4; /* Freq in KHz */
|
||||
|
||||
printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
|
||||
printk(KERN_INFO "tea5761: Frequency %d.%03d KHz (divider = 0x%04x)\n",
|
||||
frq / 1000, frq % 1000, div);
|
||||
}
|
||||
|
||||
@ -302,6 +300,7 @@ struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "tea5761";
|
||||
|
||||
memcpy(&fe->ops.tuner_ops, &tea5761_tuner_ops,
|
||||
sizeof(struct dvb_tuner_ops));
|
||||
|
@ -20,8 +20,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "tea5767"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
struct tea5767_priv {
|
||||
@ -137,14 +135,14 @@ static void tea5767_status_dump(struct tea5767_priv *priv,
|
||||
unsigned int div, frq;
|
||||
|
||||
if (TEA5767_READY_FLAG_MASK & buffer[0])
|
||||
printk(PREFIX "Ready Flag ON\n");
|
||||
tuner_info("Ready Flag ON\n");
|
||||
else
|
||||
printk(PREFIX "Ready Flag OFF\n");
|
||||
tuner_info("Ready Flag OFF\n");
|
||||
|
||||
if (TEA5767_BAND_LIMIT_MASK & buffer[0])
|
||||
printk(PREFIX "Tuner at band limit\n");
|
||||
tuner_info("Tuner at band limit\n");
|
||||
else
|
||||
printk(PREFIX "Tuner not at band limit\n");
|
||||
tuner_info("Tuner not at band limit\n");
|
||||
|
||||
div = ((buffer[0] & 0x3f) << 8) | buffer[1];
|
||||
|
||||
@ -166,23 +164,23 @@ static void tea5767_status_dump(struct tea5767_priv *priv,
|
||||
buffer[0] = (div >> 8) & 0x3f;
|
||||
buffer[1] = div & 0xff;
|
||||
|
||||
printk(PREFIX "Frequency %d.%03d KHz (divider = 0x%04x)\n",
|
||||
frq / 1000, frq % 1000, div);
|
||||
tuner_info("Frequency %d.%03d KHz (divider = 0x%04x)\n",
|
||||
frq / 1000, frq % 1000, div);
|
||||
|
||||
if (TEA5767_STEREO_MASK & buffer[2])
|
||||
printk(PREFIX "Stereo\n");
|
||||
tuner_info("Stereo\n");
|
||||
else
|
||||
printk(PREFIX "Mono\n");
|
||||
tuner_info("Mono\n");
|
||||
|
||||
printk(PREFIX "IF Counter = %d\n", buffer[2] & TEA5767_IF_CNTR_MASK);
|
||||
tuner_info("IF Counter = %d\n", buffer[2] & TEA5767_IF_CNTR_MASK);
|
||||
|
||||
printk(PREFIX "ADC Level = %d\n",
|
||||
(buffer[3] & TEA5767_ADC_LEVEL_MASK) >> 4);
|
||||
tuner_info("ADC Level = %d\n",
|
||||
(buffer[3] & TEA5767_ADC_LEVEL_MASK) >> 4);
|
||||
|
||||
printk(PREFIX "Chip ID = %d\n", (buffer[3] & TEA5767_CHIP_ID_MASK));
|
||||
tuner_info("Chip ID = %d\n", (buffer[3] & TEA5767_CHIP_ID_MASK));
|
||||
|
||||
printk(PREFIX "Reserved = 0x%02x\n",
|
||||
(buffer[4] & TEA5767_RESERVED_MASK));
|
||||
tuner_info("Reserved = 0x%02x\n",
|
||||
(buffer[4] & TEA5767_RESERVED_MASK));
|
||||
}
|
||||
|
||||
/* Freq should be specifyed at 62.5 Hz */
|
||||
@ -456,6 +454,8 @@ struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "tea5767";
|
||||
|
||||
priv->ctrl.xtal_freq = TEA5767_HIGH_LO_32768;
|
||||
priv->ctrl.port1 = 1;
|
||||
priv->ctrl.port2 = 1;
|
||||
|
@ -17,8 +17,6 @@ static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
|
||||
#define PREFIX "tuner-simple"
|
||||
|
||||
static int offset;
|
||||
module_param(offset, int, 0664);
|
||||
MODULE_PARM_DESC(offset, "Allows to specify an offset for tuner");
|
||||
@ -738,6 +736,8 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = i2c_addr;
|
||||
priv->i2c_props.adap = i2c_adap;
|
||||
priv->i2c_props.name = "tuner-simple";
|
||||
|
||||
priv->type = type;
|
||||
priv->tun = &tuners[type];
|
||||
|
||||
|
@ -23,8 +23,6 @@
|
||||
#include "dvb_frontend.h"
|
||||
|
||||
|
||||
#define PREFIX "xc2028"
|
||||
|
||||
static int debug;
|
||||
module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "enable verbose debug messages");
|
||||
@ -1153,13 +1151,13 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
|
||||
void *video_dev;
|
||||
|
||||
if (debug)
|
||||
printk(KERN_DEBUG PREFIX ": Xcv2028/3028 init called!\n");
|
||||
printk(KERN_DEBUG "xc2028: Xcv2028/3028 init called!\n");
|
||||
|
||||
if (NULL == cfg || NULL == cfg->video_dev)
|
||||
return NULL;
|
||||
|
||||
if (!fe) {
|
||||
printk(KERN_ERR PREFIX ": No frontend!\n");
|
||||
printk(KERN_ERR "xc2028: No frontend!\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -1183,6 +1181,8 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
|
||||
|
||||
priv->i2c_props.addr = cfg->i2c_addr;
|
||||
priv->i2c_props.adap = cfg->i2c_adap;
|
||||
priv->i2c_props.name = "xc2028";
|
||||
|
||||
priv->video_dev = video_dev;
|
||||
priv->tuner_callback = cfg->callback;
|
||||
priv->ctrl.max_len = 13;
|
||||
|
Loading…
Reference in New Issue
Block a user