Skip to contentSkip to conversation

kobject: fix code style and drop newline

PATCH In review Bo YU 2 participants 6 messages Jan 9, 2019

Subsystems (2)
lore
Share & tools
lore

Bo YU

author
#0 lore raw

v5 cover kobject: fix code style and drop newline

There are some mirror changes in kobject_uevent.c.

Btw, this is v5 for the patchset.2/2 was fixed by v1-v4,but 1/2 was marked V2 :(.

Bo YU (2):
kobject: to repalce printk with pr_* style
kobject: drop newline from msg string

 lib/kobject_uevent.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--
2.11.0

author
#1 lore raw

PATCH v5 1/2 kobject: to repalce printk with pr_* style

Repalce printk with pr_warn in kobject_synth_uevent and replace printk with pr_err in uevent_net_init to make both consistent with other code in kobject_uevent.c

---
Changes in V2:
Improve the commit log, doing as the patch did.

---
 lib/kobject_uevent.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +2 -3
index 27c6118afd1c..c87a96c4800e 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);
@@ -765,8 +765,7 @@ static int uevent_net_init(struct net *net)
 
 	ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
 	if (!ue_sk->sk) {
-		printk(KERN_ERR
-		       "kobject_uevent: unable to create netlink socket!\n");
+		pr_err("kobject_uevent: unable to create netlink socket!\n");
 		kfree(ue_sk);
 		return -ENODEV;
 	}
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH v5 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.

Change in V3:
Improve the commit log, requested by Rafael.

Changes in V2:
Drop newline from msg according to Joe's suggestion.

---
 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +3 -3
index c87a96c4800e..f05802687ba4 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 v5 1/2
#2 lore raw

Re: [PATCH V5 1/2] kobject: to repalce printk with pr_* style

In reply to Bo YU
Quoted 6 lines · Bo YU

Repalce printk with pr_warn in kobject_synth_uevent and replace printk with pr_err in uevent_net_init to make both consistent with other code in kobject_uevent.c

Quoted 34 lines

---
Changes in V2:
Improve the commit log, doing as the patch did.

---
 lib/kobject_uevent.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +2 -4
index 27c6118afd1c..c87a96c4800e 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);
@@ -765,8 +765,7 @@ static int uevent_net_init(struct net *net)
 
        ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
        if (!ue_sk->sk) {
-               printk(KERN_ERR
-                      "kobject_uevent: unable to create netlink socket!\n");
+               pr_err("kobject_uevent: unable to create netlink socket!\n");
                kfree(ue_sk);
                return -ENODEV;
        }
--

2.11.0

maintainer Reviewed-by on v5 2/2
#4 lore raw

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

In reply to Bo YU
Quoted 5 lines · Bo YU

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

I have given you an R-by for this one already, so why haven't you added it here?

Quoted 47 lines

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

Change in V3:
Improve the commit log, requested by Rafael.

Changes in V2:
Drop newline from msg according to Joe's suggestion.

---
 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +3 -4
index c87a96c4800e..f05802687ba4 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

author
#5 lore raw

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

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

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

I have given you an R-by for this one already, so why haven't you added it here?

Oh, i got it.This is the first time i encountered the circumstances.

Quoted 2 lines

Thank you :)

Quoted 48 lines
Quoted 48 lines

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

Change in V3:
Improve the commit log, requested by Rafael.

Changes in V2:
Drop newline from msg according to Joe's suggestion.

---
 lib/kobject_uevent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
lib/kobject_uevent.c +3 -4
index c87a96c4800e..f05802687ba4 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