renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

media: pvrusb2: replace printk with pr_*

Browse Source 
Replace calls to `printk` with the appropriate `pr_*`
macro.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2018-10-08 08:06:47 -04:00 committed by Mauro Carvalho Chehab
parent ce32c0a530
commit 8f845c6331
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/pvrusb2/pvrusb2-debug.h
View File

@ -17,7 +17,7 @@
extern int pvrusb2_debug; extern int pvrusb2_debug;
#define pvr2_trace(msk, fmt, arg...) do {if(msk & pvrusb2_debug) printk(KERN_INFO "pvrusb2: " fmt "\n", ##arg); } while (0) #define pvr2_trace(msk, fmt, arg...) do {if (msk & pvrusb2_debug) pr_info("pvrusb2: " fmt "\n", ##arg); } while (0)
/* These are listed in *rough* order of decreasing usefulness and /* These are listed in *rough* order of decreasing usefulness and
increasing noise level. */ increasing noise level. */

8
drivers/media/usb/pvrusb2/pvrusb2-hdw.c
View File

@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)
int nr = pvr2_hdw_get_unit_number(hdw); int nr = pvr2_hdw_get_unit_number(hdw);
LOCK_TAKE(hdw->big_lock); LOCK_TAKE(hdw->big_lock);
do { do {
printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); pr_info("pvrusb2: ================= START STATUS CARD #%d =================\n", nr);
v4l2_device_call_all(&hdw->v4l2_dev, 0, core, log_status); v4l2_device_call_all(&hdw->v4l2_dev, 0, core, log_status);
pvr2_trace(PVR2_TRACE_INFO,"cx2341x config:"); pvr2_trace(PVR2_TRACE_INFO,"cx2341x config:");
cx2341x_log_status(&hdw->enc_ctl_state, "pvrusb2"); cx2341x_log_status(&hdw->enc_ctl_state, "pvrusb2");
pvr2_hdw_state_log_state(hdw); pvr2_hdw_state_log_state(hdw);
printk(KERN_INFO "pvrusb2: ================== END STATUS CARD #%d ==================\n", nr); pr_info("pvrusb2: ================== END STATUS CARD #%d ==================\n", nr);
} while (0); } while (0);
LOCK_GIVE(hdw->big_lock); LOCK_GIVE(hdw->big_lock);
} }
@ -4851,7 +4851,7 @@ static void pvr2_hdw_state_log_state(struct pvr2_hdw *hdw)
for (idx = 0; ; idx++) { for (idx = 0; ; idx++) {
ccnt = pvr2_hdw_report_unlocked(hdw,idx,buf,sizeof(buf)); ccnt = pvr2_hdw_report_unlocked(hdw,idx,buf,sizeof(buf));
if (!ccnt) break; if (!ccnt) break;
printk(KERN_INFO "%s %.*s\n",hdw->name,ccnt,buf); pr_info("%s %.*s\n", hdw->name, ccnt, buf);
} }
ccnt = pvr2_hdw_report_clients(hdw, buf, sizeof(buf)); ccnt = pvr2_hdw_report_clients(hdw, buf, sizeof(buf));
if (ccnt >= sizeof(buf)) if (ccnt >= sizeof(buf))
@ -4863,7 +4863,7 @@ static void pvr2_hdw_state_log_state(struct pvr2_hdw *hdw)
while ((lcnt + ucnt < ccnt) && (buf[lcnt + ucnt] != '\n')) { while ((lcnt + ucnt < ccnt) && (buf[lcnt + ucnt] != '\n')) {
lcnt++; lcnt++;
} }
printk(KERN_INFO "%s %.*s\n", hdw->name, lcnt, buf + ucnt); pr_info("%s %.*s\n", hdw->name, lcnt, buf + ucnt);
ucnt += lcnt + 1; ucnt += lcnt + 1;
} }
} }

28
drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
View File

@ -478,8 +478,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,
unsigned int idx,offs,cnt; unsigned int idx,offs,cnt;
for (idx = 0; idx < num; idx++) { for (idx = 0; idx < num; idx++) {
cnt = msgs[idx].len; cnt = msgs[idx].len;
printk(KERN_INFO pr_info("pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s",
"pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s",
idx+1,num, idx+1,num,
msgs[idx].addr, msgs[idx].addr,
cnt, cnt,
@ -487,22 +486,21 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,
"read" : "write")); "read" : "write"));
if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) { if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) {
if (cnt > 8) cnt = 8; if (cnt > 8) cnt = 8;
printk(KERN_CONT " ["); pr_cont(" [");
for (offs = 0; offs < cnt; offs++) { for (offs = 0; offs < cnt; offs++) {
if (offs) printk(KERN_CONT " "); if (offs) pr_cont(" ");
printk(KERN_CONT "%02x",msgs[idx].buf[offs]); pr_cont("%02x", msgs[idx].buf[offs]);
} }
if (offs < cnt) printk(KERN_CONT " ..."); if (offs < cnt) pr_cont(" ...");
printk(KERN_CONT "]"); pr_cont("]");
} }
if (idx+1 == num) { if (idx+1 == num) {
printk(KERN_CONT " result=%d",ret); pr_cont(" result=%d", ret);
} }
printk(KERN_CONT "\n"); pr_cont("\n");
} }
if (!num) { if (!num) {
printk(KERN_INFO pr_info("pvrusb2 i2c xfer null transfer result=%d\n",
"pvrusb2 i2c xfer null transfer result=%d\n",
ret); ret);
} }
} }
@ -542,14 +540,14 @@ static int do_i2c_probe(struct pvr2_hdw *hdw, int addr)
static void do_i2c_scan(struct pvr2_hdw *hdw) static void do_i2c_scan(struct pvr2_hdw *hdw)
{ {
int i; int i;
printk(KERN_INFO "%s: i2c scan beginning\n", hdw->name); pr_info("%s: i2c scan beginning\n", hdw->name);
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
if (do_i2c_probe(hdw, i)) { if (do_i2c_probe(hdw, i)) {
printk(KERN_INFO "%s: i2c scan: found device @ 0x%x\n", pr_info("%s: i2c scan: found device @ 0x%x\n",
hdw->name, i); hdw->name, i);
} }
} }
printk(KERN_INFO "%s: i2c scan done.\n", hdw->name); pr_info("%s: i2c scan done.\n", hdw->name);
} }
static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw) static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw)
@ -612,7 +610,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
/* However, deal with various special cases for 24xxx hardware. */ /* However, deal with various special cases for 24xxx hardware. */
if (ir_mode[hdw->unit_number] == 0) { if (ir_mode[hdw->unit_number] == 0) {
printk(KERN_INFO "%s: IR disabled\n",hdw->name); pr_info("%s: IR disabled\n", hdw->name);
hdw->i2c_func[0x18] = i2c_black_hole; hdw->i2c_func[0x18] = i2c_black_hole;
} else if (ir_mode[hdw->unit_number] == 1) { } else if (ir_mode[hdw->unit_number] == 1) {
if (hdw->ir_scheme_active == PVR2_IR_SCHEME_24XXX) { if (hdw->ir_scheme_active == PVR2_IR_SCHEME_24XXX) {

4
drivers/media/usb/pvrusb2/pvrusb2-main.c
View File

@ -132,10 +132,10 @@ static int __init pvr_init(void)
ret = usb_register(&pvr_driver); ret = usb_register(&pvr_driver);
if (ret == 0) if (ret == 0)
printk(KERN_INFO "pvrusb2: " DRIVER_VERSION ":" pr_info("pvrusb2: " DRIVER_VERSION ":"
DRIVER_DESC "\n"); DRIVER_DESC "\n");
if (pvrusb2_debug) if (pvrusb2_debug)
printk(KERN_INFO "pvrusb2: Debug mask is %d (0x%x)\n", pr_info("pvrusb2: Debug mask is %d (0x%x)\n",
pvrusb2_debug,pvrusb2_debug); pvrusb2_debug,pvrusb2_debug);
pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete"); pvr2_trace(PVR2_TRACE_INIT,"pvr_init complete");

4
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
View File

@ -869,7 +869,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
are gone. */ are gone. */
video_unregister_device(&dip->devbase); video_unregister_device(&dip->devbase);
printk(KERN_INFO "%s\n", msg); pr_info("%s\n", msg);
} }
@ -1260,7 +1260,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
": Failed to register pvrusb2 v4l device\n"); ": Failed to register pvrusb2 v4l device\n");
} }
printk(KERN_INFO "pvrusb2: registered device %s [%s]\n", pr_info("pvrusb2: registered device %s [%s]\n",
video_device_node_name(&dip->devbase), video_device_node_name(&dip->devbase),
pvr2_config_get_name(dip->config)); pvr2_config_get_name(dip->config));