2015-02-24 18:53:52

by Shuah Khan

Subject: [PATCH] media: em28xx replace printk in dprintk macros

Replace printk macro in dprintk macros in em28xx audio, dvb,
and input files with pr_* equivalent routines.

Signed-off-by: Shuah Khan <[email protected]>
---
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); \
}

/**********************************************************
--
2.1.0

2015-02-24 22:03:21

by Mauro Carvalho Chehab

Subject: Re: [PATCH] media: em28xx replace printk in dprintk macros

Em Tue, 24 Feb 2015 11:53:47 -0700
Shuah Khan <[email protected]> escreveu:

> Replace printk macro in dprintk macros in em28xx audio, dvb,
> and input files with pr_* equivalent routines.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> 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
> }
>
> /**********************************************************

2015-02-24 23:41:10

by Shuah Khan

Subject: Re: [PATCH] media: em28xx replace printk in dprintk macros

On 02/24/2015 03:03 PM, Mauro Carvalho Chehab wrote:
> Em Tue, 24 Feb 2015 11:53:47 -0700
> Shuah Khan <[email protected]> escreveu:
>
>> Replace printk macro in dprintk macros in em28xx audio, dvb,
>> and input files with pr_* equivalent routines.
>>
>> Signed-off-by: Shuah Khan <[email protected]>
>> ---
>> 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


--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
[email protected] | (970) 217-8978

2015-02-25 03:45:55

by Joe Perches

Subject: Re: [PATCH] media: em28xx replace printk in dprintk macros

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 <[email protected]> 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.

2015-02-25 12:09:09

by Mauro Carvalho Chehab

Subject: Re: [PATCH] media: em28xx replace printk in dprintk macros

Em Tue, 24 Feb 2015 19:45:50 -0800
Joe Perches <[email protected]> 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 <[email protected]> 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