media: pvrusb2: replace `printk` with `pr_*`
Subsystems (2)
PATCH 1/1 media: pvrusb2: replace `printk` with `pr_*`
Replace calls to printk with the appropriate pr_* macro.
--- drivers/media/usb/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +++--- drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 28 +++++++++----------- drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-- 5 files changed, 22 insertions(+), 24 deletions(-)
drivers/media/usb/pvrusb2/pvrusb2-debug.h +1 -1
@@ -17,7 +17,7 @@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 increasing noise level. */
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +4 -4
@@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)int nr =pvr2_hdw_get_unit_number (hdw);LOCK_TAKE (hdw->big_lock);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);pvr2_trace (PVR2_TRACE_INFO ,"cx2341x config:" );cx2341x_log_status (&hdw->enc_ctl_state,"pvrusb2" );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 );LOCK_GIVE (hdw->big_lock); }
@@ -4851,7 +4851,7 @@ static void pvr2_hdw_state_log_state(struct pvr2_hdw *hdw)for (idx =0 ; ; idx++) { ccnt =pvr2_hdw_report_unlocked (hdw,idx,buf,sizeof (buf));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));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' )) { 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 ; } }
drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c +13 -15
@@ -478,8 +478,7 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap,unsigned int idx,offs,cnt;for (idx =0 ; idx < num; idx++) { cnt = msgs[idx].len; - printk(KERN_INFO - "pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s", + pr_info("pvrusb2 i2c xfer %u/%u: addr=0x%x len=%d %s", idx+1,num, msgs[idx].addr, cnt,
@@ -487,22 +486,21 @@ static int pvr2_i2c_xfer(struct i2c_adapter *i2c_adap, "read" : "write")); if ((ret > 0) || !(msgs[idx].flags & I2C_M_RD)) {if (cnt >8 ) cnt =8 ; -printk (KERN_CONT " [" ); +pr_cont (" [" );for (offs =0 ; offs < cnt; offs++) { -if (offs)printk (KERN_CONT " " ); -printk (KERN_CONT "%02x" ,msgs[idx].buf[offs]); +if (offs)pr_cont (" " ); +pr_cont ("%02x" , msgs[idx].buf[offs]); } -if (offs < cnt)printk (KERN_CONT " ..." ); -printk (KERN_CONT "]" ); +if (offs < cnt)pr_cont (" ..." ); +pr_cont ("]" ); }if (idx+1 == num) { -printk (KERN_CONT " result=%d" ,ret); +pr_cont (" result=%d" , ret); } -printk (KERN_CONT "\n" ); +pr_cont ("\n" ); }if (!num) { -printk (KERN_INFO -"pvrusb2 i2c xfer null transfer result=%d\n" , +pr_info ("pvrusb2 i2c xfer null transfer result=%d\n" , 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) {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++) {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); } } -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)
@@ -612,7 +610,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)/* However, deal with various special cases for 24xxx hardware. */ 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; }else if (ir_mode[hdw->unit_number] ==1 ) {if (hdw->ir_scheme_active ==PVR2_IR_SCHEME_24XXX ) {
drivers/media/usb/pvrusb2/pvrusb2-main.c +2 -2
@@ -132,10 +132,10 @@ static int __init pvr_init(void) ret =usb_register (&pvr_driver);if (ret ==0 ) -printk (KERN_INFO "pvrusb2: " DRIVER_VERSION ":" +pr_info ("pvrusb2: " DRIVER_VERSION ":" DRIVER_DESC "\n" );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);pvr2_trace (PVR2_TRACE_INIT ,"pvr_init complete" );
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +2 -2
@@ -869,7 +869,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)are gone. */ 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"); } -printk (KERN_INFO "pvrusb2: registered device %s [%s]\n" , +pr_info ("pvrusb2: registered device %s [%s]\n" ,video_device_node_name (&dip->devbase),pvr2_config_get_name (dip->config));
Signature · 1 line
2.17.1
Quoted 17 lines · Dafna Hirschfeld
Replace calls to
printkwith the appropriatepr_*macro.Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/usb/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +++--- drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 28 +++++++++----------- drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-- 5 files changed, 22 insertions(+), 24 deletions(-)drivers/media/usb/pvrusb2/pvrusb2-debug.h +0
-0
drivers/media/usb/pvrusb2/pvrusb2-debug.h line 20
Quoted 5 lines
drivers/media/usb/pvrusb2/pvrusb2-debug.h +1
-1@@ -17,7 +17,7 @@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)
You should not need prefixes for pr_info() calls.
drivers/media/usb/pvrusb2/pvrusb2-hdw.c void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw) · line 3296
Quoted 13 lines
drivers/media/usb/pvrusb2/pvrusb2-debug.h +0
-0/* These are listed in *rough* order of decreasing usefulness and increasing noise level. */ drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1
-1@@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)int nr =pvr2_hdw_get_unit_number (hdw);LOCK_TAKE (hdw->big_lock); do { - printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); + pr_info("pvrusb2: ================= START STATUS CARD #%d =================\n", nr);
A driver should be using dev_info(), not pr_*.
Also, for the outreachy application process, I can not accept patches outside of drivers/staging/.
sorry,
greg k-h
Quoted 27 lines · Greg KH
Quoted 17 lines · Dafna Hirschfeld
Replace calls to
printkwith the appropriatepr_*macro.Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/usb/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +++--- drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 28 +++++++++----------- drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-- 5 files changed, 22 insertions(+), 24 deletions(-)drivers/media/usb/pvrusb2/pvrusb2-debug.h +0
-0drivers/media/usb/pvrusb2/pvrusb2-debug.h line 20
Quoted 5 lines
drivers/media/usb/pvrusb2/pvrusb2-debug.h +1
-1@@ -17,7 +17,7 @@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)You should not need prefixes for
pr_info()calls.Quoted 1 line
Quoted 14 lines
drivers/media/usb/pvrusb2/pvrusb2-hdw.c void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw) · line 3296
Quoted 12 lines
/* These are listed in *rough* order of decreasing usefulness and
increasing noise level. */drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1
-1@@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)int nr =pvr2_hdw_get_unit_number (hdw);LOCK_TAKE (hdw->big_lock); do { - printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); + pr_info("pvrusb2: ================= START STATUS CARD #%d =================\n", nr);A driver should be using
dev_info(), not pr_*.
pvrusb2 is an exception due to historical reasons. I'd rather not switch over to dev_*.
Quoted 3 lines
Also, for the outreachy application process, I can not accept patches outside of
drivers/staging/.
Hmm, that means media drivers are out of bounds since drivers in staging/media are either high-quality drivers waiting for missing core features or that need maturing, or they are deprecated drivers that will be removed in the not-too-distant future and we're not accepting patches for those.
Whereas there are loads of old media drivers in driver/media that could use some TLC. Although pvrusb2 was an unfortunate driver to pick, but Dafna had no way of knowing that.
There might be the odd checkpatch issue in staging/media, but I expect that that will be slim pickings...
Sorry Dafna, I wasn't aware of this restriction. It looks like you will need to look elsewhere in staging.
Regards,
Hans
Quoted 5 lines
sorry,
greg k-h
Quoted 43 lines · Hans Verkuil
Quoted 27 lines · Greg KH
Quoted 17 lines · Dafna Hirschfeld
Replace calls to
printkwith the appropriatepr_*macro.Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/usb/pvrusb2/pvrusb2-debug.h | 2 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 8 +++--- drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 28 +++++++++----------- drivers/media/usb/pvrusb2/pvrusb2-main.c | 4 +-- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-- 5 files changed, 22 insertions(+), 24 deletions(-)drivers/media/usb/pvrusb2/pvrusb2-debug.h +0
-0drivers/media/usb/pvrusb2/pvrusb2-debug.h line 20
Quoted 5 lines
drivers/media/usb/pvrusb2/pvrusb2-debug.h +1
-1@@ -17,7 +17,7 @@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)You should not need prefixes for
pr_info()calls.Quoted 1 line
Quoted 14 lines
drivers/media/usb/pvrusb2/pvrusb2-hdw.c void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw) · line 3296
Quoted 12 lines
/* These are listed in *rough* order of decreasing usefulness and
increasing noise level. */drivers/media/usb/pvrusb2/pvrusb2-hdw.c +1
-1@@ -3293,12 +3293,12 @@ void pvr2_hdw_trigger_module_log(struct pvr2_hdw *hdw)int nr =pvr2_hdw_get_unit_number (hdw);LOCK_TAKE (hdw->big_lock); do { - printk(KERN_INFO "pvrusb2: ================= START STATUS CARD #%d =================\n", nr); + pr_info("pvrusb2: ================= START STATUS CARD #%d =================\n", nr);A driver should be using
dev_info(), not pr_*.
Quoted 2 lines
pvrusb2 is an exception due to historical reasons. I'd rather not switch over to dev_*.
Why should a historical reason be needed to fix up code to be correct?
Why not use the correct functions? You will just constantly be rejecting patches like this for the next 20+ years :(
thanks,
greg k-h