kobject: trival fix
Subsystems (2)
v3 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
--
2.11.0
PATCH v3 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
@@ -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
PATCH v3 2/2 kobject: drop newline from msg string
In reply to Bo YUThere is currently a missing terminating newline in non-switch case match, when msg == NULL.
---
Changes in v3:
Improve the commit log,requested by rafael.
Changes in v2:
According to Joe's suggestion,drop newline from msg
lib/kobject_uevent.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
lib/kobject_uevent.c +6 -5
@@ -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,8 +223,9 @@ 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 ); -pr_warn ("synth uevent: %s: %s" , +char *devpath =kobject_get_path (kobj,GFP_KERNEL ); + +pr_warn ("synth uevent: %s: %s\n" , devpath ?:"unknown device" , msg ?:"failed to send uevent" );kfree (devpath);
--
2.11.0
Greg KH
maintainerRe: [PATCH v3 2/2] kobject: drop newline from msg string
Quoted 19 lines · Bo YU
There is currently a missing terminating newline in non-switch case match, when msg == NULL.
Signed-off-by Bo YU <[email protected]>---
Changes in v3:
Improve the commit log,requested by rafael.Changes in v2:
According to Joe's suggestion,drop newline from msglib/kobject_uevent.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)lib/kobject_uevent.c +0
-0
lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 198
Quoted 5 lines
lib/kobject_uevent.c +1
-1@@ -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 ;
Why did you move the devpath variable from here to lower down? That really doesn't do anything :(
thanks,
greg k-h
Re: [PATCH v3 2/2] kobject: drop newline from msg string
Quoted 15 lines · Greg KH
Quoted 14 lines · Bo YU
There is currently a missing terminating newline in non-switch case match, when msg == NULL.
Signed-off-by Bo YU <[email protected]>---
Changes in v3:
Improve the commit log,requested by rafael.Changes in v2:
According to Joe's suggestion,drop newline from msglib/kobject_uevent.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Quoted 13 lines
lib/kobject_uevent.c int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count) · line 198
Quoted 10 lines
lib/kobject_uevent.c +1
-1@@ -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 ;Why did you move the devpath variable from here to lower down? That really doesn't do anything :(
Hm...If i resend the one patch will be ok?
Or whole series?
Quoted 4 lines
thanks,
greg k-h