Skip to content

L
linux
Commit 680d87c0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
1 Browse files
Options

[media] tuner-core: use pr_foo, instead of internal printk macros 

Tuner core uses its own printk internal macros, instead of the
standard debug ones, for no good reason.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent cc8e7ff4
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 63 deletions
drivers/media/v4l2-core/tuner-core.c
View file @ 680d87c0
...@@ -84,30 +84,16 @@ static const struct v4l2_subdev_ops tuner_ops; ...@@ -84,30 +84,16 @@ static const struct v4l2_subdev_ops tuner_ops;
* Debug macros * Debug macros
*/ */
#define tuner_warn(fmt, arg...) do { \ #undef pr_fmt
printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), \ #define pr_fmt(fmt) KBUILD_MODNAME ": %d-%04x: " fmt, \
t->i2c->addr, ##arg); \ i2c_adapter_id(t->i2c->adapter), t->i2c->addr
} while (0)
#define tuner_info(fmt, arg...) do { \ #define dprintk(fmt, arg...) do { \
printk(KERN_INFO "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), \
t->i2c->addr, ##arg); \
} while (0)
#define tuner_err(fmt, arg...) do { \
printk(KERN_ERR "%s %d-%04x: " fmt, PREFIX, \
i2c_adapter_id(t->i2c->adapter), \
t->i2c->addr, ##arg); \
} while (0)
#define tuner_dbg(fmt, arg...) do { \
if (tuner_debug) \ if (tuner_debug) \
printk(KERN_DEBUG "%s %d-%04x: " fmt, PREFIX, \ printk(KERN_DEBUG pr_fmt("%s: " fmt), __func__, ##arg); \
i2c_adapter_id(t->i2c->adapter), \ } while (0)
t->i2c->addr, ##arg); \
} while (0)
/* /*
* Internal struct used inside the driver * Internal struct used inside the driver
...@@ -208,7 +194,7 @@ static void fe_set_params(struct dvb_frontend *fe, ...@@ -208,7 +194,7 @@ static void fe_set_params(struct dvb_frontend *fe,
struct tuner *t = fe->analog_demod_priv; struct tuner *t = fe->analog_demod_priv;
if (NULL == fe_tuner_ops->set_analog_params) { if (NULL == fe_tuner_ops->set_analog_params) {
tuner_warn("Tuner frontend module has no way to set freq\n"); pr_warn("Tuner frontend module has no way to set freq\n");
return; return;
} }
fe_tuner_ops->set_analog_params(fe, params); fe_tuner_ops->set_analog_params(fe, params);
...@@ -230,7 +216,7 @@ static int fe_set_config(struct dvb_frontend *fe, void *priv_cfg) ...@@ -230,7 +216,7 @@ static int fe_set_config(struct dvb_frontend *fe, void *priv_cfg)
if (fe_tuner_ops->set_config) if (fe_tuner_ops->set_config)
return fe_tuner_ops->set_config(fe, priv_cfg); return fe_tuner_ops->set_config(fe, priv_cfg);
tuner_warn("Tuner frontend module has no way to set config\n"); pr_warn("Tuner frontend module has no way to set config\n");
return 0; return 0;
} }
...@@ -273,14 +259,14 @@ static void set_type(struct i2c_client *c, unsigned int type, ...@@ -273,14 +259,14 @@ static void set_type(struct i2c_client *c, unsigned int type,
int tune_now = 1; int tune_now = 1;
if (type == UNSET || type == TUNER_ABSENT) { if (type == UNSET || type == TUNER_ABSENT) {
tuner_dbg("tuner 0x%02x: Tuner type absent\n", c->addr); dprintk("tuner 0x%02x: Tuner type absent\n", c->addr);
return; return;
} }
t->type = type; t->type = type;
t->config = new_config; t->config = new_config;
if (tuner_callback != NULL) { if (tuner_callback != NULL) {
tuner_dbg("defining GPIO callback\n"); dprintk("defining GPIO callback\n");
t->fe.callback = tuner_callback; t->fe.callback = tuner_callback;
} }
...@@ -442,7 +428,7 @@ static void set_type(struct i2c_client *c, unsigned int type, ...@@ -442,7 +428,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
t->sd.entity.name = t->name; t->sd.entity.name = t->name;
#endif #endif
tuner_dbg("type set to %s\n", t->name); dprintk("type set to %s\n", t->name);
t->mode_mask = new_mode_mask; t->mode_mask = new_mode_mask;
...@@ -459,13 +445,13 @@ static void set_type(struct i2c_client *c, unsigned int type, ...@@ -459,13 +445,13 @@ static void set_type(struct i2c_client *c, unsigned int type,
set_tv_freq(c, t->tv_freq); set_tv_freq(c, t->tv_freq);
} }
tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", dprintk("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
c->adapter->name, c->dev.driver->name, c->addr << 1, type, c->adapter->name, c->dev.driver->name, c->addr << 1, type,
t->mode_mask); t->mode_mask);
return; return;
attach_failed: attach_failed:
tuner_dbg("Tuner attach for type = %d failed.\n", t->type); dprintk("Tuner attach for type = %d failed.\n", t->type);
t->type = TUNER_ABSENT; t->type = TUNER_ABSENT;
return; return;
...@@ -491,7 +477,7 @@ static int tuner_s_type_addr(struct v4l2_subdev *sd, ...@@ -491,7 +477,7 @@ static int tuner_s_type_addr(struct v4l2_subdev *sd,
struct tuner *t = to_tuner(sd); struct tuner *t = to_tuner(sd);
struct i2c_client *c = v4l2_get_subdevdata(sd); struct i2c_client *c = v4l2_get_subdevdata(sd);
tuner_dbg("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x, config=%p\n", dprintk("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x, config=%p\n",
tun_setup->type, tun_setup->type,
tun_setup->addr, tun_setup->addr,
tun_setup->mode_mask, tun_setup->mode_mask,
...@@ -503,7 +489,7 @@ static int tuner_s_type_addr(struct v4l2_subdev *sd, ...@@ -503,7 +489,7 @@ static int tuner_s_type_addr(struct v4l2_subdev *sd,
set_type(c, tun_setup->type, tun_setup->mode_mask, set_type(c, tun_setup->type, tun_setup->mode_mask,
tun_setup->config, tun_setup->tuner_callback); tun_setup->config, tun_setup->tuner_callback);
} else } else
tuner_dbg("set addr discarded for type %i, mask %x. Asked to change tuner at addr 0x%02x, with mask %x\n", dprintk("set addr discarded for type %i, mask %x. Asked to change tuner at addr 0x%02x, with mask %x\n",
t->type, t->mode_mask, t->type, t->mode_mask,
tun_setup->addr, tun_setup->mode_mask); tun_setup->addr, tun_setup->mode_mask);
...@@ -533,7 +519,7 @@ static int tuner_s_config(struct v4l2_subdev *sd, ...@@ -533,7 +519,7 @@ static int tuner_s_config(struct v4l2_subdev *sd,
return 0; return 0;
} }
tuner_dbg("Tuner frontend module has no way to set config\n"); dprintk("Tuner frontend module has no way to set config\n");
return 0; return 0;
} }
...@@ -622,7 +608,7 @@ static int tuner_probe(struct i2c_client *client, ...@@ -622,7 +608,7 @@ static int tuner_probe(struct i2c_client *client,
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
rc = i2c_master_recv(client, buffer, sizeof(buffer)); rc = i2c_master_recv(client, buffer, sizeof(buffer));
if (rc >= 0) if (rc >= 0)
tuner_info("I2C RECV = %*ph\n", rc, buffer); pr_info("I2C RECV = %*ph\n", rc, buffer);
} }
/* autodetection code based on the i2c addr */ /* autodetection code based on the i2c addr */
...@@ -650,7 +636,7 @@ static int tuner_probe(struct i2c_client *client, ...@@ -650,7 +636,7 @@ static int tuner_probe(struct i2c_client *client,
since it can be tda9887*/ since it can be tda9887*/
if (tuner_symbol_probe(tda829x_probe, t->i2c->adapter, if (tuner_symbol_probe(tda829x_probe, t->i2c->adapter,
t->i2c->addr) >= 0) { t->i2c->addr) >= 0) {
tuner_dbg("tda829x detected\n"); dprintk("tda829x detected\n");
} else { } else {
/* Default is being tda9887 */ /* Default is being tda9887 */
t->type = TUNER_TDA9887; t->type = TUNER_TDA9887;
...@@ -687,7 +673,7 @@ static int tuner_probe(struct i2c_client *client, ...@@ -687,7 +673,7 @@ static int tuner_probe(struct i2c_client *client,
t->mode_mask = T_ANALOG_TV; t->mode_mask = T_ANALOG_TV;
if (radio == NULL) if (radio == NULL)
t->mode_mask |= T_RADIO; t->mode_mask |= T_RADIO;
tuner_dbg("Setting mode_mask to 0x%02x\n", t->mode_mask); dprintk("Setting mode_mask to 0x%02x\n", t->mode_mask);
} }
/* Should be just before return */ /* Should be just before return */
...@@ -716,7 +702,7 @@ static int tuner_probe(struct i2c_client *client, ...@@ -716,7 +702,7 @@ static int tuner_probe(struct i2c_client *client,
} }
if (ret < 0) { if (ret < 0) {
tuner_err("failed to initialize media entity!\n"); pr_err("failed to initialize media entity!\n");
kfree(t); kfree(t);
return ret; return ret;
} }
...@@ -729,7 +715,7 @@ static int tuner_probe(struct i2c_client *client, ...@@ -729,7 +715,7 @@ static int tuner_probe(struct i2c_client *client,
set_type(client, t->type, t->mode_mask, t->config, t->fe.callback); set_type(client, t->type, t->mode_mask, t->config, t->fe.callback);
list_add_tail(&t->list, &tuner_list); list_add_tail(&t->list, &tuner_list);
tuner_info("Tuner %d found with type(s)%s%s.\n", pr_info("Tuner %d found with type(s)%s%s.\n",
t->type, t->type,
t->mode_mask & T_RADIO ? " Radio" : "", t->mode_mask & T_RADIO ? " Radio" : "",
t->mode_mask & T_ANALOG_TV ? " TV" : ""); t->mode_mask & T_ANALOG_TV ? " TV" : "");
...@@ -806,7 +792,7 @@ static int set_mode(struct tuner *t, enum v4l2_tuner_type mode) ...@@ -806,7 +792,7 @@ static int set_mode(struct tuner *t, enum v4l2_tuner_type mode)
if (mode != t->mode) { if (mode != t->mode) {
if (check_mode(t, mode) == -EINVAL) { if (check_mode(t, mode) == -EINVAL) {
tuner_dbg("Tuner doesn't support mode %d. Putting tuner to sleep\n", dprintk("Tuner doesn't support mode %d. Putting tuner to sleep\n",
mode); mode);
t->standby = true; t->standby = true;
if (analog_ops->standby) if (analog_ops->standby)
...@@ -814,7 +800,7 @@ static int set_mode(struct tuner *t, enum v4l2_tuner_type mode) ...@@ -814,7 +800,7 @@ static int set_mode(struct tuner *t, enum v4l2_tuner_type mode)
return -EINVAL; return -EINVAL;
} }
t->mode = mode; t->mode = mode;
tuner_dbg("Changing to mode %d\n", mode); dprintk("Changing to mode %d\n", mode);
} }
return 0; return 0;
} }
...@@ -861,15 +847,15 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq) ...@@ -861,15 +847,15 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
}; };
if (t->type == UNSET) { if (t->type == UNSET) {
tuner_warn("tuner type not set\n"); pr_warn("tuner type not set\n");
return; return;
} }
if (NULL == analog_ops->set_params) { if (NULL == analog_ops->set_params) {
tuner_warn("Tuner has no way to set tv freq\n"); pr_warn("Tuner has no way to set tv freq\n");
return; return;
} }
if (freq < tv_range[0] * 16 || freq > tv_range[1] * 16) { if (freq < tv_range[0] * 16 || freq > tv_range[1] * 16) {
tuner_dbg("TV freq (%d.%02d) out of range (%d-%d)\n", dprintk("TV freq (%d.%02d) out of range (%d-%d)\n",
freq / 16, freq % 16 * 100 / 16, tv_range[0], freq / 16, freq % 16 * 100 / 16, tv_range[0],
tv_range[1]); tv_range[1]);
/* V4L2 spec: if the freq is not possible then the closest /* V4L2 spec: if the freq is not possible then the closest
...@@ -880,7 +866,7 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq) ...@@ -880,7 +866,7 @@ static void set_tv_freq(struct i2c_client *c, unsigned int freq)
freq = tv_range[1] * 16; freq = tv_range[1] * 16;
} }
params.frequency = freq; params.frequency = freq;
tuner_dbg("tv freq set to %d.%02d\n", dprintk("tv freq set to %d.%02d\n",
freq / 16, freq % 16 * 100 / 16); freq / 16, freq % 16 * 100 / 16);
t->tv_freq = freq; t->tv_freq = freq;
t->standby = false; t->standby = false;
...@@ -930,7 +916,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std) ...@@ -930,7 +916,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std)
return V4L2_STD_PAL_Nc; return V4L2_STD_PAL_Nc;
return V4L2_STD_PAL_N; return V4L2_STD_PAL_N;
default: default:
tuner_warn("pal= argument not recognised\n"); pr_warn("pal= argument not recognised\n");
break; break;
} }
} }
...@@ -956,7 +942,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std) ...@@ -956,7 +942,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std)
return V4L2_STD_SECAM_LC; return V4L2_STD_SECAM_LC;
return V4L2_STD_SECAM_L; return V4L2_STD_SECAM_L;
default: default:
tuner_warn("secam= argument not recognised\n"); pr_warn("secam= argument not recognised\n");
break; break;
} }
} }
...@@ -973,7 +959,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std) ...@@ -973,7 +959,7 @@ static v4l2_std_id tuner_fixup_std(struct tuner *t, v4l2_std_id std)
case 'K': case 'K':
return V4L2_STD_NTSC_M_KR; return V4L2_STD_NTSC_M_KR;
default: default:
tuner_info("ntsc= argument not recognised\n"); pr_info("ntsc= argument not recognised\n");
break; break;
} }
} }
...@@ -1002,15 +988,15 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq) ...@@ -1002,15 +988,15 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
}; };
if (t->type == UNSET) { if (t->type == UNSET) {
tuner_warn("tuner type not set\n"); pr_warn("tuner type not set\n");
return; return;
} }
if (NULL == analog_ops->set_params) { if (NULL == analog_ops->set_params) {
tuner_warn("tuner has no way to set radio frequency\n"); pr_warn("tuner has no way to set radio frequency\n");
return; return;
} }
if (freq < radio_range[0] * 16000 || freq > radio_range[1] * 16000) { if (freq < radio_range[0] * 16000 || freq > radio_range[1] * 16000) {
tuner_dbg("radio freq (%d.%02d) out of range (%d-%d)\n", dprintk("radio freq (%d.%02d) out of range (%d-%d)\n",
freq / 16000, freq % 16000 * 100 / 16000, freq / 16000, freq % 16000 * 100 / 16000,
radio_range[0], radio_range[1]); radio_range[0], radio_range[1]);
/* V4L2 spec: if the freq is not possible then the closest /* V4L2 spec: if the freq is not possible then the closest
...@@ -1021,7 +1007,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq) ...@@ -1021,7 +1007,7 @@ static void set_radio_freq(struct i2c_client *c, unsigned int freq)
freq = radio_range[1] * 16000; freq = radio_range[1] * 16000;
} }
params.frequency = freq; params.frequency = freq;
tuner_dbg("radio freq set to %d.%02d\n", dprintk("radio freq set to %d.%02d\n",
freq / 16000, freq % 16000 * 100 / 16000); freq / 16000, freq % 16000 * 100 / 16000);
t->radio_freq = freq; t->radio_freq = freq;
t->standby = false; t->standby = false;
...@@ -1072,10 +1058,10 @@ static void tuner_status(struct dvb_frontend *fe) ...@@ -1072,10 +1058,10 @@ static void tuner_status(struct dvb_frontend *fe)
freq = t->tv_freq / 16; freq = t->tv_freq / 16;
freq_fraction = (t->tv_freq % 16) * 100 / 16; freq_fraction = (t->tv_freq % 16) * 100 / 16;
} }
tuner_info("Tuner mode: %s%s\n", p, pr_info("Tuner mode: %s%s\n", p,
t->standby ? " on standby mode" : ""); t->standby ? " on standby mode" : "");
tuner_info("Frequency: %lu.%02lu MHz\n", freq, freq_fraction); pr_info("Frequency: %lu.%02lu MHz\n", freq, freq_fraction);
tuner_info("Standard: 0x%08lx\n", (unsigned long)t->std); pr_info("Standard: 0x%08lx\n", (unsigned long)t->std);
if (t->mode != V4L2_TUNER_RADIO) if (t->mode != V4L2_TUNER_RADIO)
return; return;
if (fe_tuner_ops->get_status) { if (fe_tuner_ops->get_status) {
...@@ -1083,15 +1069,15 @@ static void tuner_status(struct dvb_frontend *fe) ...@@ -1083,15 +1069,15 @@ static void tuner_status(struct dvb_frontend *fe)
fe_tuner_ops->get_status(&t->fe, &tuner_status); fe_tuner_ops->get_status(&t->fe, &tuner_status);
if (tuner_status & TUNER_STATUS_LOCKED) if (tuner_status & TUNER_STATUS_LOCKED)
tuner_info("Tuner is locked.\n"); pr_info("Tuner is locked.\n");
if (tuner_status & TUNER_STATUS_STEREO) if (tuner_status & TUNER_STATUS_STEREO)
tuner_info("Stereo: yes\n"); pr_info("Stereo: yes\n");
} }
if (analog_ops->has_signal) { if (analog_ops->has_signal) {
u16 signal; u16 signal;
if (!analog_ops->has_signal(fe, &signal)) if (!analog_ops->has_signal(fe, &signal))
tuner_info("Signal strength: %hu\n", signal); pr_info("Signal strength: %hu\n", signal);
} }
} }
...@@ -1124,13 +1110,13 @@ static int tuner_s_power(struct v4l2_subdev *sd, int on) ...@@ -1124,13 +1110,13 @@ static int tuner_s_power(struct v4l2_subdev *sd, int on)
if (on) { if (on) {
if (t->standby && set_mode(t, t->mode) == 0) { if (t->standby && set_mode(t, t->mode) == 0) {
tuner_dbg("Waking up tuner\n"); dprintk("Waking up tuner\n");
set_freq(t, 0); set_freq(t, 0);
} }
return 0; return 0;
} }
tuner_dbg("Putting tuner to sleep\n"); dprintk("Putting tuner to sleep\n");
t->standby = true; t->standby = true;
if (analog_ops->standby) if (analog_ops->standby)
analog_ops->standby(&t->fe); analog_ops->standby(&t->fe);
...@@ -1146,7 +1132,7 @@ static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std) ...@@ -1146,7 +1132,7 @@ static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
t->std = tuner_fixup_std(t, std); t->std = tuner_fixup_std(t, std);
if (t->std != std) if (t->std != std)
tuner_dbg("Fixup standard %llx to %llx\n", std, t->std); dprintk("Fixup standard %llx to %llx\n", std, t->std);
set_freq(t, 0); set_freq(t, 0);
return 0; return 0;
} }
...@@ -1295,7 +1281,7 @@ static int tuner_suspend(struct device *dev) ...@@ -1295,7 +1281,7 @@ static int tuner_suspend(struct device *dev)
struct tuner *t = to_tuner(i2c_get_clientdata(c)); struct tuner *t = to_tuner(i2c_get_clientdata(c));
struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops;
tuner_dbg("suspend\n"); dprintk("suspend\n");
if (t->fe.ops.tuner_ops.suspend) if (t->fe.ops.tuner_ops.suspend)
t->fe.ops.tuner_ops.suspend(&t->fe); t->fe.ops.tuner_ops.suspend(&t->fe);
...@@ -1310,7 +1296,7 @@ static int tuner_resume(struct device *dev) ...@@ -1310,7 +1296,7 @@ static int tuner_resume(struct device *dev)
struct i2c_client *c = to_i2c_client(dev); struct i2c_client *c = to_i2c_client(dev);
struct tuner *t = to_tuner(i2c_get_clientdata(c)); struct tuner *t = to_tuner(i2c_get_clientdata(c));
tuner_dbg("resume\n"); dprintk("resume\n");
if (t->fe.ops.tuner_ops.resume) if (t->fe.ops.tuner_ops.resume)
t->fe.ops.tuner_ops.resume(&t->fe); t->fe.ops.tuner_ops.resume(&t->fe);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7