Skip to contentSkip to conversation

kobject: fix warnings from ehcekpatch.pl

PATCH In review Bo YU 2 participants 8 messages Oct 30, 2018 – Nov 1, 2018

Subsystems (2)
Library code Driver core
lore
Share & tools
lore

Bo YU

author
#0 lore raw

cover kobject: fix warnings from ehcekpatch.pl

Hi,this is a series of patches which fix warning from checkpatch.pl. I do not know which tree should apply these patches,so i git format-patch from linus' s kernel tree.

Bo YU (3):
kobject: drop unnecessary cast "%llu" for u64
kobject: Fix warnings in lib/kobject_uevent.c
kobject: fix warnings use pr_* to replace printk

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

--
2.11.0

author
#1 lore raw

PATCH 1/3 kobject: drop unnecessary cast "%llu" for u64

There is no searon for u64 var cast to unsigned long long type.

Signed-off-by Bo YU <[email protected]>
---
 lib/kobject_uevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kobject_uevent.c +1 -1
index 63d0816ab23b..402765c3a9cb 100644
@@ -579,7 +579,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
 
 	mutex_lock(&uevent_sock_mutex);
 	/* we will send an event, so request a new sequence number */
-	retval = add_uevent_var(env, "SEQNUM=%llu", (unsigned long long)++uevent_seqnum);
+	retval = add_uevent_var(env, "SEQNUM=%llu", ++uevent_seqnum);
 	if (retval) {
 		mutex_unlock(&uevent_sock_mutex);
 		goto exit;

--
2.11.0

author
#2 lore raw

PATCH 2/3 kobject: Fix warnings in lib/kobject_uevent.c

In reply to Bo YU

Add a blank after declaration.

Signed-off-by Bo YU <[email protected]>
---
 lib/kobject_uevent.c | 2 ++
 1 file changed, 2 insertions(+)
lib/kobject_uevent.c +2 -0
index 402765c3a9cb..27c6118afd1c 100644
@@ -240,6 +240,7 @@ static int kobj_usermode_filter(struct kobject *kobj)
 	ops = kobj_ns_ops(kobj);
 	if (ops) {
 		const void *init_ns, *ns;
+
 		ns = kobj->ktype->namespace(kobj);
 		init_ns = ops->initial_ns();
 		return ns != init_ns;

@@ -390,6 +391,7 @@ static int kobject_uevent_net_broadcast(struct kobject *kobj,
 	ops = kobj_ns_ops(kobj);
 	if (!ops && kobj->kset) {
 		struct kobject *ksobj = &kobj->kset->kobj;
+
 		if (ksobj->parent != NULL)
 			ops = kobj_ns_ops(ksobj->parent);
 	}
Signature · 1 line
2.11.0
author
#3 lore raw

PATCH 3/3 kobject: fix warnings use pr_* to replace printk

In reply to Bo YU

Fix warning from checkpatch.pl use pr_* to replace printk

Signed-off-by Bo YU <[email protected]>
---
 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;
 	}

--
2.11.0

#4 lore raw

Re: [PATCH 3/3] kobject: fix warnings use pr_* to replace printk

Quoted 1 line · Bo YU

Fix warning from checkpatch.pl use pr_* to replace printk

If you look at msg, it can be unterminated with newline.

lib/kobject_uevent.c

Quoted 1 line
lib/kobject_uevent.c +0 -0

[]

lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 230

Quoted 9 lines
lib/kobject_uevent.c +1 -1
@@ -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);

Perhaps this block should be:

lib/kobject_uevent.c +8 -7
index 63d0816ab23b..0ba1197f366e 100644
@@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	enum kobject_action action;
 	const char *action_args;
 	struct kobj_uevent_env *env;
-	const char *msg = NULL, *devpath;
+	const char *msg = NULL;
 	int r;
 
 	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;
 	}
 

@@ -223,10 +223,11 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	kfree(env);
 out:
 	if (r) {
-		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		printk(KERN_WARNING "synth uevent: %s: %s",
-		       devpath ?: "unknown device",
-		       msg ?: "failed to send uevent");
+		char *devpath devpath = kobject_get_path(kobj, GFP_KERNEL);
+
+		pr_warn("synth uevent: %s: %s\n",
+			devpath ?: "unknown device",
+			msg ?: "failed to send uevent");
 		kfree(devpath);
 	}
 	return r;
author
#5 lore raw

Re: [PATCH 3/3] kobject: fix warnings use pr_* to replace printk

Hi,

Quoted 60 lines · Joe Perches
Quoted 1 line · Bo YU

Fix warning from checkpatch.pl use pr_* to replace printk

If you look at msg, it can be unterminated with newline.

lib/kobject_uevent.c

Quoted 1 line
lib/kobject_uevent.c +0 -0

[]

lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 230

Quoted 9 lines
lib/kobject_uevent.c +1 -1
@@ -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);

Perhaps this block should be:

lib/kobject_uevent.c +3 -3
index 63d0816ab23b..0ba1197f366e 100644
@@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	enum kobject_action action;
 	const char *action_args;
 	struct kobj_uevent_env *env;
-	const char *msg = NULL, *devpath;
+	const char *msg = NULL;
 	int r;
 
 	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;
 	}
 

@@ -223,10 +223,11 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	kfree(env);

out:

	if (r) {
lib/kobject_uevent.c +5 -4
-		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		printk(KERN_WARNING "synth uevent: %s: %s",
-		       devpath ?: "unknown device",
-		       msg ?: "failed to send uevent");
+		char *devpath devpath = kobject_get_path(kobj, GFP_KERNEL);
+
+		pr_warn("synth uevent: %s: %s\n",
+			devpath ?: "unknown device",
+			msg ?: "failed to send uevent");
Quoted 3 lines
		kfree(devpath);
	}
	return r;

Sorry, but i have two stupid questions to annoy you:
Q1: If i agree with your patch, here should i to do? Acked-by tag or others or nothing to do?
Q2: In fact, i do not know how to test the patch. Only to cat /sys/bus/pci/* or something? Thanks,

Quoted 2 lines
#6 lore raw

Re: [PATCH 3/3] kobject: fix warnings use pr_* to replace printk

Quoted 59 lines · YU Bo

Hi,

Quoted 57 lines · Joe Perches
Quoted 1 line · Bo YU

Fix warning from checkpatch.pl use pr_* to replace printk

If you look at msg, it can be unterminated with newline.

lib/kobject_uevent.c

Quoted 1 line
lib/kobject_uevent.c +0 -0

[]

lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 230

Quoted 9 lines
lib/kobject_uevent.c +1 -1
@@ -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);

Perhaps this block should be:

lib/kobject_uevent.c +3 -3
index 63d0816ab23b..0ba1197f366e 100644
@@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	enum kobject_action action;
 	const char *action_args;
 	struct kobj_uevent_env *env;
-	const char *msg = NULL, *devpath;
+	const char *msg = NULL;
 	int r;
 
 	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;
 	}
 

@@ -223,10 +223,11 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	kfree(env);

out:

	if (r) {
lib/kobject_uevent.c +2 -4
-		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		printk(KERN_WARNING "synth uevent: %s: %s",
-		       devpath ?: "unknown device",
-		       msg ?: "failed to send uevent");
+		char *devpath devpath = kobject_get_path(kobj, GFP_KERNEL);
+
Quoted 8 lines
Quoted 6 lines
lib/kobject_uevent.c +3 -0
+		pr_warn("synth uevent: %s: %s\n",
+			devpath ?: "unknown device",
+			msg ?: "failed to send uevent");

		kfree(devpath);
	}
	return r;

Sorry, but i have two stupid questions to annoy you:
Q1: If i agree with your patch, here should i to do? Acked-by tag or others or nothing to do?

Send V2 with content and explanation of what
it does and why.

Quoted 1 line

Q2: In fact, i do not know how to test the patch. Only to cat /sys/bus/pci/* or something?

That wouldn't work as these go to dmesg only on
certain conditions.

It's a trivial patch, obviously correct.

author
#7 lore raw

Re: [PATCH 3/3] kobject: fix warnings use pr_* to replace printk

Quoted 72 lines · Joe Perches
Quoted 59 lines · YU Bo

Hi,

Quoted 57 lines · Joe Perches
Quoted 1 line · Bo YU

Fix warning from checkpatch.pl use pr_* to replace printk

If you look at msg, it can be unterminated with newline.

lib/kobject_uevent.c

Quoted 1 line
lib/kobject_uevent.c +0 -0

[]

lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 230

Quoted 9 lines
lib/kobject_uevent.c +1 -1
@@ -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);

Perhaps this block should be:

lib/kobject_uevent.c +3 -3
index 63d0816ab23b..0ba1197f366e 100644
@@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	enum kobject_action action;
 	const char *action_args;
 	struct kobj_uevent_env *env;
-	const char *msg = NULL, *devpath;
+	const char *msg = NULL;
 	int r;
 
 	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;
 	}
 

@@ -223,10 +223,11 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	kfree(env);

out:

	if (r) {
lib/kobject_uevent.c +2 -4
-		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		printk(KERN_WARNING "synth uevent: %s: %s",
-		       devpath ?: "unknown device",
-		       msg ?: "failed to send uevent");
+		char *devpath devpath = kobject_get_path(kobj, GFP_KERNEL);
+
Quoted 8 lines
Quoted 6 lines
lib/kobject_uevent.c +3 -0
+		pr_warn("synth uevent: %s: %s\n",
+			devpath ?: "unknown device",
+			msg ?: "failed to send uevent");

		kfree(devpath);
	}
	return r;

Sorry, but i have two stupid questions to annoy you:
Q1: If i agree with your patch, here should i to do? Acked-by tag or others or nothing to do?

Send V2 with content and explanation of what
it does and why.

Quoted 6 lines
Quoted 1 line

Q2: In fact, i do not know how to test the patch. Only to cat /sys/bus/pci/* or something?

That wouldn't work as these go to dmesg only on
certain conditions.

It's a trivial patch, obviously correct.

Thank you, joe, i will do.

Quoted 2 lines