* [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
@ 2012-09-11 2:50 Bruce Humphrey
2012-09-11 2:52 ` Greg KH
2012-09-11 10:59 ` [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Dan Carpenter
0 siblings, 2 replies; 8+ messages in thread
From: Bruce Humphrey @ 2012-09-11 2:50 UTC (permalink / raw)
To: abbotti, fmhess, gregkh, hsweeten; +Cc: devel, linux-kernel, Bruce Humphrey
Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.com>
---
drivers/staging/comedi/drivers/fl512.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index d1da809..258a7b4 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
iobase = it->options[0];
- printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
+ pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
if (!request_region(iobase, FL512_SIZE, "fl512")) {
- printk(KERN_WARNING " I/O port conflict\n");
+ pr_warn(" I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -129,7 +129,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENOMEM;
#if DEBUG
- printk(KERN_DEBUG "malloc ok\n");
+ pr_debug("malloc ok\n");
#endif
ret = comedi_alloc_subdevices(dev, 2);
@@ -153,7 +153,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_fl512;
/* function to call when read AD */
s->insn_read = fl512_ai_insn;
- printk(KERN_INFO "comedi: fl512: subdevice 0 initialized\n");
+ pr_info("comedi: fl512: subdevice 0 initialized\n");
/* Analog output */
s = dev->subdevices + 1;
@@ -171,7 +171,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_write = fl512_ao_insn;
/* function to call when reading DA */
s->insn_read = fl512_ao_insn_readback;
- printk(KERN_INFO "comedi: fl512: subdevice 1 initialized\n");
+ pr_info("comedi: fl512: subdevice 1 initialized\n");
return 1;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 2:50 [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Bruce Humphrey
@ 2012-09-11 2:52 ` Greg KH
2012-09-11 3:40 ` Joe Perches
2012-09-11 15:19 ` [PATCH] checkpatch: Update suggested printk conversions Joe Perches
2012-09-11 10:59 ` [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Dan Carpenter
1 sibling, 2 replies; 8+ messages in thread
From: Greg KH @ 2012-09-11 2:52 UTC (permalink / raw)
To: Bruce Humphrey; +Cc: abbotti, fmhess, hsweeten, devel, linux-kernel
On Tue, Sep 11, 2012 at 04:50:15AM +0200, Bruce Humphrey wrote:
> Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
>
> Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.com>
> ---
> drivers/staging/comedi/drivers/fl512.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
> index d1da809..258a7b4 100644
> --- a/drivers/staging/comedi/drivers/fl512.c
> +++ b/drivers/staging/comedi/drivers/fl512.c
> @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> struct comedi_subdevice *s;
>
> iobase = it->options[0];
> - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> + pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
Why can't you use dev_info() here, and in other places? You should use
the dev_* functions instead of pr_* wherever possible.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 2:52 ` Greg KH
@ 2012-09-11 3:40 ` Joe Perches
2012-09-11 3:44 ` Greg KH
2012-09-11 11:02 ` Dan Carpenter
2012-09-11 15:19 ` [PATCH] checkpatch: Update suggested printk conversions Joe Perches
1 sibling, 2 replies; 8+ messages in thread
From: Joe Perches @ 2012-09-11 3:40 UTC (permalink / raw)
To: Greg KH; +Cc: Bruce Humphrey, abbotti, fmhess, hsweeten, devel, linux-kernel
On Mon, 2012-09-10 at 19:52 -0700, Greg KH wrote:
> On Tue, Sep 11, 2012 at 04:50:15AM +0200, Bruce Humphrey wrote:
> > Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
[]
> > diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
[]
> > @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
[]
> > - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> > + pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
>
> Why can't you use dev_info() here, and in other places? You should use
> the dev_* functions instead of pr_* wherever possible.
Checkpatch instigates these conversions.
Perhaps something like:
---
scripts/checkpatch.pl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ca05ba2..e1f4390 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -421,7 +421,7 @@ sub top_of_kernel_tree {
}
}
return 1;
- }
+}
sub parse_email {
my ($formatted_email) = @_;
@@ -2390,8 +2390,10 @@ sub process {
my $orig = $1;
my $level = lc($orig);
$level = "warn" if ($level eq "warning");
+ my $level2 = $level;
+ $level2 = "dbg" if ($level eq "debug");
WARN("PREFER_PR_LEVEL",
- "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+ "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr);
}
if ($line =~ /\bpr_warning\s*\(/) {
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 3:40 ` Joe Perches
@ 2012-09-11 3:44 ` Greg KH
2012-09-11 3:48 ` Joe Perches
2012-09-11 11:02 ` Dan Carpenter
1 sibling, 1 reply; 8+ messages in thread
From: Greg KH @ 2012-09-11 3:44 UTC (permalink / raw)
To: Joe Perches
Cc: Bruce Humphrey, abbotti, fmhess, hsweeten, devel, linux-kernel
On Mon, Sep 10, 2012 at 08:40:11PM -0700, Joe Perches wrote:
> On Mon, 2012-09-10 at 19:52 -0700, Greg KH wrote:
> > On Tue, Sep 11, 2012 at 04:50:15AM +0200, Bruce Humphrey wrote:
> > > Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
> []
> > > diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
> []
> > > @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> []
> > > - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> > > + pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> >
> > Why can't you use dev_info() here, and in other places? You should use
> > the dev_* functions instead of pr_* wherever possible.
>
> Checkpatch instigates these conversions.
I know.
> Perhaps something like:
That looks like a good start, until someone tries to use netdev_* in a
random non-network driver :)
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 3:44 ` Greg KH
@ 2012-09-11 3:48 ` Joe Perches
0 siblings, 0 replies; 8+ messages in thread
From: Joe Perches @ 2012-09-11 3:48 UTC (permalink / raw)
To: Greg KH; +Cc: Bruce Humphrey, abbotti, fmhess, hsweeten, devel, linux-kernel
On Mon, 2012-09-10 at 20:44 -0700, Greg KH wrote:
> On Mon, Sep 10, 2012 at 08:40:11PM -0700, Joe Perches wrote:
> > On Mon, 2012-09-10 at 19:52 -0700, Greg KH wrote:
> > > On Tue, Sep 11, 2012 at 04:50:15AM +0200, Bruce Humphrey wrote:
> > > > Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
> > []
> > > > diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
> > []
> > > > @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> > []
> > > > - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> > > > + pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> > >
> > > Why can't you use dev_info() here, and in other places? You should use
> > > the dev_* functions instead of pr_* wherever possible.
> >
> > Checkpatch instigates these conversions.
>
> I know.
>
> > Perhaps something like:
>
> That looks like a good start, until someone tries to use netdev_* in a
> random non-network driver :)
Hence the "netdev_<level>(netdev, ...) then dev_<level>(dev, ..., etc...
You can only make people read not understand.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 3:40 ` Joe Perches
2012-09-11 3:44 ` Greg KH
@ 2012-09-11 11:02 ` Dan Carpenter
1 sibling, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2012-09-11 11:02 UTC (permalink / raw)
To: Joe Perches; +Cc: Greg KH, devel, fmhess, Bruce Humphrey, linux-kernel, abbotti
Yeah. That would be great. Thanks, Joe.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] checkpatch: Update suggested printk conversions
2012-09-11 2:52 ` Greg KH
2012-09-11 3:40 ` Joe Perches
@ 2012-09-11 15:19 ` Joe Perches
1 sibling, 0 replies; 8+ messages in thread
From: Joe Perches @ 2012-09-11 15:19 UTC (permalink / raw)
To: Andrew Morton, Andy Whitcroft; +Cc: Greg KH, Dan Carpenter, linux-kernel
Direct conversion of printk(KERN_<LEVEL>... to pr_<level> isn't
the preferred conversion when a struct net_device or struct device
is available.
Hint that using netdev_<level> or dev_<level> is preferred to using
pr_<level>. Add netdev_dbg and dev_dbg variants too.
Miscellaneous whitespace neatening of a misplaced close brace.
Signed-off-by: Joe Perches <joe@perches.com>
---
scripts/checkpatch.pl | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ca05ba2..e1f4390 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -421,7 +421,7 @@ sub top_of_kernel_tree {
}
}
return 1;
- }
+}
sub parse_email {
my ($formatted_email) = @_;
@@ -2390,8 +2390,10 @@ sub process {
my $orig = $1;
my $level = lc($orig);
$level = "warn" if ($level eq "warning");
+ my $level2 = $level;
+ $level2 = "dbg" if ($level eq "debug");
WARN("PREFER_PR_LEVEL",
- "Prefer pr_$level(... to printk(KERN_$1, ...\n" . $herecurr);
+ "Prefer netdev_$level2(netdev, ... then dev_$level2(dev, ... then pr_$level(... to printk(KERN_$orig ...\n" . $herecurr);
}
if ($line =~ /\bpr_warning\s*\(/) {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info(...
2012-09-11 2:50 [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Bruce Humphrey
2012-09-11 2:52 ` Greg KH
@ 2012-09-11 10:59 ` Dan Carpenter
1 sibling, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2012-09-11 10:59 UTC (permalink / raw)
To: Bruce Humphrey; +Cc: abbotti, fmhess, gregkh, hsweeten, devel, linux-kernel
On Tue, Sep 11, 2012 at 04:50:15AM +0200, Bruce Humphrey wrote:
> Change 5 instances of printk(KERN_INFO, KERN_WARN and KERN_ERROR for the prefered pr_info, pr_warn and pr_error
>
> Signed-off-by: Bruce Humphrey Ventura <brucehum@gmail.com>
> ---
> drivers/staging/comedi/drivers/fl512.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
> index d1da809..258a7b4 100644
> --- a/drivers/staging/comedi/drivers/fl512.c
> +++ b/drivers/staging/comedi/drivers/fl512.c
> @@ -118,9 +118,9 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
> struct comedi_subdevice *s;
>
> iobase = it->options[0];
> - printk(KERN_INFO "comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> + pr_info("comedi:%d fl512: 0x%04lx", dev->minor, iobase);
> if (!request_region(iobase, FL512_SIZE, "fl512")) {
> - printk(KERN_WARNING " I/O port conflict\n");
> + pr_warn(" I/O port conflict\n");
> return -EIO;
These weren't right at all in the original code. Doing small white
space cleanups is pointless when the print statements are wrong.
(Line continuations. Also printing bogus nonsense. Look Hartley's
patches for examples on how to fix these properly).
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-09-11 15:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-11 2:50 [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Bruce Humphrey
2012-09-11 2:52 ` Greg KH
2012-09-11 3:40 ` Joe Perches
2012-09-11 3:44 ` Greg KH
2012-09-11 3:48 ` Joe Perches
2012-09-11 11:02 ` Dan Carpenter
2012-09-11 15:19 ` [PATCH] checkpatch: Update suggested printk conversions Joe Perches
2012-09-11 10:59 ` [PATCH] Staging: comedi: drivers: fl512: change printk(KERN_INFO ... for the prefered pr_info( Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).