2014-10-01 20:35:40

by Paul McQuade

Subject: [PATCH] mm: ksm use pr_err instead of printk

WARNING: Prefer: pr_err(... to printk(KERN_ERR ...

Signed-off-by: Paul McQuade <[email protected]>
---
mm/ksm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index fb75902..79a26b4 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2310,7 +2310,7 @@ static int __init ksm_init(void)

ksm_thread = kthread_run(ksm_scan_thread, NULL, "ksmd");
if (IS_ERR(ksm_thread)) {
- printk(KERN_ERR "ksm: creating kthread failed\n");
+ pr_err(KERN_ERR "ksm: creating kthread failed\n");
err = PTR_ERR(ksm_thread);
goto out_free;
}
@@ -2318,7 +2318,7 @@ static int __init ksm_init(void)
#ifdef CONFIG_SYSFS
err = sysfs_create_group(mm_kobj, &ksm_attr_group);
if (err) {
- printk(KERN_ERR "ksm: register sysfs failed\n");
+ pr_err(KERN_ERR "ksm: register sysfs failed\n");
kthread_stop(ksm_thread);
goto out_free;
}
--
1.9.1

2014-10-01 20:50:57

by Andrew Morton

Subject: Re: [PATCH] mm: ksm use pr_err instead of printk

On Wed, 1 Oct 2014 21:35:30 +0100 Paul McQuade <[email protected]> wrote:

> WARNING: Prefer: pr_err(... to printk(KERN_ERR ...
>
> Signed-off-by: Paul McQuade <[email protected]>
> ---
> mm/ksm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/ksm.c b/mm/ksm.c
> index fb75902..79a26b4 100644
> --- a/mm/ksm.c
> +++ b/mm/ksm.c
> @@ -2310,7 +2310,7 @@ static int __init ksm_init(void)
>
> ksm_thread = kthread_run(ksm_scan_thread, NULL, "ksmd");
> if (IS_ERR(ksm_thread)) {
> - printk(KERN_ERR "ksm: creating kthread failed\n");
> + pr_err(KERN_ERR "ksm: creating kthread failed\n");
> err = PTR_ERR(ksm_thread);
> goto out_free;
> }
> @@ -2318,7 +2318,7 @@ static int __init ksm_init(void)
> #ifdef CONFIG_SYSFS
> err = sysfs_create_group(mm_kobj, &ksm_attr_group);
> if (err) {
> - printk(KERN_ERR "ksm: register sysfs failed\n");
> + pr_err(KERN_ERR "ksm: register sysfs failed\n");
> kthread_stop(ksm_thread);
> goto out_free;
> }

err,

--- a/mm/ksm.c~mm-ksm-use-pr_err-instead-of-printk-fix
+++ a/mm/ksm.c
@@ -2310,7 +2310,7 @@ static int __init ksm_init(void)

ksm_thread = kthread_run(ksm_scan_thread, NULL, "ksmd");
if (IS_ERR(ksm_thread)) {
- pr_err(KERN_ERR "ksm: creating kthread failed\n");
+ pr_err("ksm: creating kthread failed\n");
err = PTR_ERR(ksm_thread);
goto out_free;
}
@@ -2318,7 +2318,7 @@ static int __init ksm_init(void)
#ifdef CONFIG_SYSFS
err = sysfs_create_group(mm_kobj, &ksm_attr_group);
if (err) {
- pr_err(KERN_ERR "ksm: register sysfs failed\n");
+ pr_err("ksm: register sysfs failed\n");
kthread_stop(ksm_thread);
goto out_free;
}


A quick grep indicates that we have the same mistake in tens of places.
checkpatch rule, please?

2014-10-02 04:08:25

by Joe Perches

Subject: [PATCH] checkpatch: Warn on logging functions with KERN_<LEVEL>

Warn on probable misuses of logging functions with KERN_<LEVEL>
like pr_err(KERN_ERR "foo\n");

Suggested-by: Andrew Morton <[email protected]>
Signed-off-by: Joe Perches <[email protected]>

---
> > - printk(KERN_ERR "ksm: register sysfs failed\n");
> > + pr_err(KERN_ERR "ksm: register sysfs failed\n");

> A quick grep indicates that we have the same mistake in tens of places.
> checkpatch rule, please?

scripts/checkpatch.pl | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 52a223e..374abf4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4447,6 +4447,17 @@ sub process {
}
}

+# check for logging functions with KERN_<LEVEL>
+ if ($line !~ /printk\s*\(/ &&
+ $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) {
+ my $level = $1;
+ if (WARN("UNNECESSARY_KERN_LEVEL",
+ "Possible unnecessary $level\n" . $herecurr) &&
+ $fix) {
+ $fixed[$fixlinenr] =~ s/\s*$level\s*//;
+ }
+ }
+
# check for bad placement of section $InitAttribute (e.g.: __initdata)
if ($line =~ /(\b$InitAttribute\b)/) {
my $attr = $1;