Skip to contentSkip to conversation

kobject: trival fix

PATCH In review Bo YU 2 participants 7 messages Jan 8, 2019

Subsystems (2)
lore
Share & tools
lore

Bo YU

author
#0 lore raw

v4 cover kobject: trival fix

This is trival fix for lib/kobject_uevent.c file.

Bo YU (2):
kobject: use pr_warn to replace printk
kobject: drop newline from msg string

 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--
2.11.0

author
#1 lore raw

PATCH v4 1/2 kobject: use pr_warn to replace printk

This is a fix to replace printk with pr_warn

---
 lib/kobject_uevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject_uevent.c +1 -1
index 27c6118afd1c..499dfcdafcb0 100644
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 out:
 	if (r) {
 		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		printk(KERN_WARNING "synth uevent: %s: %s",
+		pr_warn("synth uevent: %s: %s",
 		       devpath ?: "unknown device",
 		       msg ?: "failed to send uevent");
 		kfree(devpath);
Signature · 1 line
2.11.0
#2 lore raw

Re: [PATCH v4 1/2] kobject: use pr_warn to replace printk

Quoted 2 lines · Bo YU

This is a fix to replace printk with pr_warn

You call it a "fix", but what exactly is wrong with the code as is?

Quoted 21 lines
---
 lib/kobject_uevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject_uevent.c +1 -2
index 27c6118afd1c..499dfcdafcb0 100644
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 out:
        if (r) {
                devpath = kobject_get_path(kobj, GFP_KERNEL);
-               printk(KERN_WARNING "synth uevent: %s: %s",
+               pr_warn("synth uevent: %s: %s",
                       devpath ?: "unknown device",
                       msg ?: "failed to send uevent");
                kfree(devpath);
--

2.11.0

author
#3 lore raw

Re: [PATCH v4 1/2] kobject: use pr_warn to replace printk

Hi,

Quoted 5 lines · Rafael J. Wysocki
Quoted 2 lines · Bo YU

This is a fix to replace printk with pr_warn

You call it a "fix", but what exactly is wrong with the code as is?

Is there any differentions between pr_* and printk?
If they were the same with functionial, i think it would be better to use pr_* to replace printk.There are two lines code with printk only and others are pr_* in kobject_uevent.c.
In fact,as you know, the code is fine.I just want to keep consistency with looks like
Thanks

Quoted 22 lines
Quoted 22 lines
---
 lib/kobject_uevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject_uevent.c +1 -2
index 27c6118afd1c..499dfcdafcb0 100644
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 out:
        if (r) {
                devpath = kobject_get_path(kobj, GFP_KERNEL);
-               printk(KERN_WARNING "synth uevent: %s: %s",
+               pr_warn("synth uevent: %s: %s",
                       devpath ?: "unknown device",
                       msg ?: "failed to send uevent");
                kfree(devpath);
--

2.11.0

#4 lore raw

Re: [PATCH v4 1/2] kobject: use pr_warn to replace printk

Quoted 7 lines · YU Bo

Hi,

Quoted 4 lines · Rafael J. Wysocki
Quoted 2 lines · Bo YU

This is a fix to replace printk with pr_warn

Quoted 7 lines
Quoted 1 line

You call it a "fix", but what exactly is wrong with the code as is?

Is there any differentions between pr_* and printk?
If they were the same with functionial, i think it would be better to use pr_* to replace printk.There are two lines code with printk only and others are pr_* in kobject_uevent.c.
In fact,as you know, the code is fine.I just want to keep consistency with looks like

OK, so please don't call it a "fix" as doing so suggests a functional defect in the current code that is addressed by your patch which is not the case.

You can write something like

"Replace printk() with pr_warn() in kobject_synth_uevent() to make it consistent with the other code in kobject_uevent.c."

in the changelog which would be clear enough IMO.

author
#5 lore raw

PATCH v4 2/2 kobject: drop newline from msg string

In reply to Bo YU

There is currently a missing terminating newline in non-switch case match,when msg == NULL

---
Changes in V4:
Recovery originly declaration, requested by Greg.

Changes in V3:
Improve the commit log, requested by rafael.

Changes in V2:
According to Joe's suggestion, drop newline from msg string

---
 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +3 -3
index 499dfcdafcb0..118226a02707 100644
@@ -200,7 +200,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 
 	r = kobject_action_type(buf, count, &action, &action_args);
 	if (r) {
-		msg = "unknown uevent action string\n";
+		msg = "unknown uevent action string";
 		goto out;
 	}
 
@@ -212,7 +212,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	r = kobject_action_args(action_args,
 				count - (action_args - buf), &env);
 	if (r == -EINVAL) {
-		msg = "incorrect uevent action arguments\n";
+		msg = "incorrect uevent action arguments";
 		goto out;
 	}
 
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 out:
 	if (r) {
 		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		pr_warn("synth uevent: %s: %s",
+		pr_warn("synth uevent: %s: %s\n",
 		       devpath ?: "unknown device",
 		       msg ?: "failed to send uevent");
 		kfree(devpath);
Signature · 1 line
2.11.0
maintainer Reviewed-by on v4 2/2
#6 lore raw

Re: [PATCH v4 2/2] kobject: drop newline from msg string

Quoted 5 lines · Bo YU

There is currently a missing terminating newline in non-switch case match,when msg == NULL

Quoted 47 lines

---
Changes in V4:
Recovery originly declaration, requested by Greg.

Changes in V3:
Improve the commit log, requested by rafael.

Changes in V2:
According to Joe's suggestion, drop newline from msg string

---
 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +3 -4
index 499dfcdafcb0..118226a02707 100644
@@ -200,7 +200,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 
        r = kobject_action_type(buf, count, &action, &action_args);
        if (r) {
-               msg = "unknown uevent action string\n";
+               msg = "unknown uevent action string";
                goto out;
        }
 
@@ -212,7 +212,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
        r = kobject_action_args(action_args,
                                count - (action_args - buf), &env);
        if (r == -EINVAL) {
-               msg = "incorrect uevent action arguments\n";
+               msg = "incorrect uevent action arguments";
                goto out;
        }
 
@@ -224,7 +224,7 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 out:
        if (r) {
                devpath = kobject_get_path(kobj, GFP_KERNEL);
-               pr_warn("synth uevent: %s: %s",
+               pr_warn("synth uevent: %s: %s\n",
                       devpath ?: "unknown device",
                       msg ?: "failed to send uevent");
                kfree(devpath);
--

2.11.0