diff mbox

media: em28xx replace printk in dprintk macros

Message ID 1424804027-7790-1-git-send-email-shuahkh@osg.samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Shuah Khan Feb. 24, 2015, 6:53 p.m. UTC
Replace printk macro in dprintk macros in em28xx audio, dvb,
and input files with pr_* equivalent routines.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
 drivers/media/usb/em28xx/em28xx-audio.c | 3 +--
 drivers/media/usb/em28xx/em28xx-dvb.c   | 2 +-
 drivers/media/usb/em28xx/em28xx-input.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

Comments

Mauro Carvalho Chehab Feb. 24, 2015, 10:03 p.m. UTC | #1
Em Tue, 24 Feb 2015 11:53:47 -0700
Shuah Khan <shuahkh@osg.samsung.com> escreveu:

> Replace printk macro in dprintk macros in em28xx audio, dvb,
> and input files with pr_* equivalent routines.
> 
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---
>  drivers/media/usb/em28xx/em28xx-audio.c | 3 +--
>  drivers/media/usb/em28xx/em28xx-dvb.c   | 2 +-
>  drivers/media/usb/em28xx/em28xx-input.c | 2 +-
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
> index 49a5f95..93d89f2 100644
> --- a/drivers/media/usb/em28xx/em28xx-audio.c
> +++ b/drivers/media/usb/em28xx/em28xx-audio.c
> @@ -55,8 +55,7 @@ MODULE_PARM_DESC(debug, "activates debug info");
>  
>  #define dprintk(fmt, arg...) do {					\
>  	    if (debug)							\
> -		printk(KERN_INFO "em28xx-audio %s: " fmt,		\
> -				  __func__, ##arg);		\
> +		pr_info("em28xx-audio %s: " fmt, __func__, ##arg);	\
>  	} while (0)
>  
>  static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
> diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
> index aee70d4..8826054 100644
> --- a/drivers/media/usb/em28xx/em28xx-dvb.c
> +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
> @@ -71,7 +71,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
>  
>  #define dprintk(level, fmt, arg...) do {			\
>  if (debug >= level)						\
> -	printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg);	\
> +	pr_debug("%s/2-dvb: " fmt, dev->name, ## arg);		\
>  } while (0)
>  
>  struct em28xx_dvb {
> diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
> index 4007356..e99108b 100644
> --- a/drivers/media/usb/em28xx/em28xx-input.c
> +++ b/drivers/media/usb/em28xx/em28xx-input.c
> @@ -43,7 +43,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
>  
>  #define dprintk(fmt, arg...) \
>  	if (ir_debug) { \
> -		printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
> +		pr_debug("%s/ir: " fmt, ir->name, ## arg); \

NACK.

This is the worse of two words, as it would require both to enable
each debug line via dynamic printk setting and to enable ir_debug.

Regards,
Mauro
>  	}
>  
>  /**********************************************************
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Shuah Khan Feb. 24, 2015, 11:41 p.m. UTC | #2
On 02/24/2015 03:03 PM, Mauro Carvalho Chehab wrote:
> Em Tue, 24 Feb 2015 11:53:47 -0700
> Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> 
>> Replace printk macro in dprintk macros in em28xx audio, dvb,
>> and input files with pr_* equivalent routines.
>>
>> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
>> ---
>>  drivers/media/usb/em28xx/em28xx-audio.c | 3 +--
>>  drivers/media/usb/em28xx/em28xx-dvb.c   | 2 +-
>>  drivers/media/usb/em28xx/em28xx-input.c | 2 +-
>>  3 files changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
>> index 49a5f95..93d89f2 100644
>> --- a/drivers/media/usb/em28xx/em28xx-audio.c
>> +++ b/drivers/media/usb/em28xx/em28xx-audio.c
>> @@ -55,8 +55,7 @@ MODULE_PARM_DESC(debug, "activates debug info");
>>  
>>  #define dprintk(fmt, arg...) do {					\
>>  	    if (debug)							\
>> -		printk(KERN_INFO "em28xx-audio %s: " fmt,		\
>> -				  __func__, ##arg);		\
>> +		pr_info("em28xx-audio %s: " fmt, __func__, ##arg);	\
>>  	} while (0)
>>  
>>  static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
>> diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
>> index aee70d4..8826054 100644
>> --- a/drivers/media/usb/em28xx/em28xx-dvb.c
>> +++ b/drivers/media/usb/em28xx/em28xx-dvb.c
>> @@ -71,7 +71,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
>>  
>>  #define dprintk(level, fmt, arg...) do {			\
>>  if (debug >= level)						\
>> -	printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg);	\
>> +	pr_debug("%s/2-dvb: " fmt, dev->name, ## arg);		\
>>  } while (0)
>>  
>>  struct em28xx_dvb {
>> diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
>> index 4007356..e99108b 100644
>> --- a/drivers/media/usb/em28xx/em28xx-input.c
>> +++ b/drivers/media/usb/em28xx/em28xx-input.c
>> @@ -43,7 +43,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
>>  
>>  #define dprintk(fmt, arg...) \
>>  	if (ir_debug) { \
>> -		printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
>> +		pr_debug("%s/ir: " fmt, ir->name, ## arg); \
> 
> NACK.
> 
> This is the worse of two words, as it would require both to enable
> each debug line via dynamic printk setting and to enable ir_debug.
> 

Ah. I missed that. Sorry for the noise.

-- Shuah
Joe Perches Feb. 25, 2015, 3:45 a.m. UTC | #3
On Tue, 2015-02-24 at 16:41 -0700, Shuah Khan wrote:
> On 02/24/2015 03:03 PM, Mauro Carvalho Chehab wrote:
> > Em Tue, 24 Feb 2015 11:53:47 -0700 Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> >> Replace printk macro in dprintk macros in em28xx audio, dvb,
> >> and input files with pr_* equivalent routines.
[]
> >> diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
[]
> >>  #define dprintk(fmt, arg...) \
> >>  	if (ir_debug) { \
> >> -		printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
> >> +		pr_debug("%s/ir: " fmt, ir->name, ## arg); \
> > 
> > NACK.
> > 
> > This is the worse of two words, as it would require both to enable
> > each debug line via dynamic printk setting and to enable ir_debug.
> Ah. I missed that. Sorry for the noise.

It's
At some point, I'm going to propose a standard mechanism
similar to netif_<level> that does bitmap matching for
dynamic_debug and generic debugging.



--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mauro Carvalho Chehab Feb. 25, 2015, 12:09 p.m. UTC | #4
Em Tue, 24 Feb 2015 19:45:50 -0800
Joe Perches <joe@perches.com> escreveu:

> On Tue, 2015-02-24 at 16:41 -0700, Shuah Khan wrote:
> > On 02/24/2015 03:03 PM, Mauro Carvalho Chehab wrote:
> > > Em Tue, 24 Feb 2015 11:53:47 -0700 Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> > >> Replace printk macro in dprintk macros in em28xx audio, dvb,
> > >> and input files with pr_* equivalent routines.
> []
> > >> diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
> []
> > >>  #define dprintk(fmt, arg...) \
> > >>  	if (ir_debug) { \
> > >> -		printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
> > >> +		pr_debug("%s/ir: " fmt, ir->name, ## arg); \
> > > 
> > > NACK.
> > > 
> > > This is the worse of two words, as it would require both to enable
> > > each debug line via dynamic printk setting and to enable ir_debug.
> > Ah. I missed that. Sorry for the noise.
> 
> It's
> At some point, I'm going to propose a standard mechanism
> similar to netif_<level> that does bitmap matching for
> dynamic_debug and generic debugging.

Such mechanism would make sense for media drivers.

Regards,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 49a5f95..93d89f2 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -55,8 +55,7 @@  MODULE_PARM_DESC(debug, "activates debug info");
 
 #define dprintk(fmt, arg...) do {					\
 	    if (debug)							\
-		printk(KERN_INFO "em28xx-audio %s: " fmt,		\
-				  __func__, ##arg);		\
+		pr_info("em28xx-audio %s: " fmt, __func__, ##arg);	\
 	} while (0)
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index aee70d4..8826054 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -71,7 +71,7 @@  DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 #define dprintk(level, fmt, arg...) do {			\
 if (debug >= level)						\
-	printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg);	\
+	pr_debug("%s/2-dvb: " fmt, dev->name, ## arg);		\
 } while (0)
 
 struct em28xx_dvb {
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 4007356..e99108b 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -43,7 +43,7 @@  MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
 #define dprintk(fmt, arg...) \
 	if (ir_debug) { \
-		printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
+		pr_debug("%s/ir: " fmt, ir->name, ## arg); \
 	}
 
 /**********************************************************