linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V5 0/2] kobject: fix code style and drop newline
@ 2019-01-09  9:16 Bo YU
  2019-01-09  9:17 ` [PATCH V5 1/2] kobject: to repalce printk with pr_* style Bo YU
  2019-01-09  9:17 ` [PATCH V5 2/2] kobject: drop newline from msg string Bo YU
  0 siblings, 2 replies; 6+ messages in thread
From: Bo YU @ 2019-01-09  9:16 UTC (permalink / raw)
  To: gregkh, rafael; +Cc: Bo YU, linux-kernel, joe, yuzibode

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH V5 1/2] kobject: to repalce printk with pr_* style
  2019-01-09  9:16 [PATCH V5 0/2] kobject: fix code style and drop newline Bo YU
@ 2019-01-09  9:17 ` Bo YU
  2019-01-09  9:20   ` Rafael J. Wysocki
  2019-01-09  9:17 ` [PATCH V5 2/2] kobject: drop newline from msg string Bo YU
  1 sibling, 1 reply; 6+ messages in thread
From: Bo YU @ 2019-01-09  9:17 UTC (permalink / raw)
  To: gregkh, rafael; +Cc: Bo YU, linux-kernel, joe, yuzibode

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

Signed-off-by: Bo YU <tsu.yubo@gmail.com>

---
Changes in V2:
Improve the commit log, doing as the patch did.
---
 lib/kobject_uevent.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 27c6118afd1c..c87a96c4800e 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH V5 2/2] kobject: drop newline from msg string
  2019-01-09  9:16 [PATCH V5 0/2] kobject: fix code style and drop newline Bo YU
  2019-01-09  9:17 ` [PATCH V5 1/2] kobject: to repalce printk with pr_* style Bo YU
@ 2019-01-09  9:17 ` Bo YU
  2019-01-09  9:21   ` Rafael J. Wysocki
  1 sibling, 1 reply; 6+ messages in thread
From: Bo YU @ 2019-01-09  9:17 UTC (permalink / raw)
  To: gregkh, rafael; +Cc: Bo YU, linux-kernel, joe, yuzibode

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

Signed-off-by: Bo YU <tsu.yubo@gmail.com>
---
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(-)

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index c87a96c4800e..f05802687ba4 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH V5 1/2] kobject: to repalce printk with pr_* style
  2019-01-09  9:17 ` [PATCH V5 1/2] kobject: to repalce printk with pr_* style Bo YU
@ 2019-01-09  9:20   ` Rafael J. Wysocki
  0 siblings, 0 replies; 6+ messages in thread
From: Rafael J. Wysocki @ 2019-01-09  9:20 UTC (permalink / raw)
  To: Bo YU
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Linux Kernel Mailing List,
	Joe Perches, yuzibode

On Wed, Jan 9, 2019 at 10:17 AM Bo YU <tsu.yubo@gmail.com> wrote:
>
> 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
>
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

>
> ---
> Changes in V2:
> Improve the commit log, doing as the patch did.
> ---
>  lib/kobject_uevent.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index 27c6118afd1c..c87a96c4800e 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -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
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH V5 2/2] kobject: drop newline from msg string
  2019-01-09  9:17 ` [PATCH V5 2/2] kobject: drop newline from msg string Bo YU
@ 2019-01-09  9:21   ` Rafael J. Wysocki
  2019-01-09  9:30     ` YU Bo
  0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2019-01-09  9:21 UTC (permalink / raw)
  To: Bo YU
  Cc: Greg Kroah-Hartman, Rafael J. Wysocki, Linux Kernel Mailing List,
	Joe Perches, yuzibode

On Wed, Jan 9, 2019 at 10:17 AM Bo YU <tsu.yubo@gmail.com> wrote:
>
> There is currently a missing terminating newline in non-switch case
> match when msg == NULL
>
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>

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

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
> 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(-)
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index c87a96c4800e..f05802687ba4 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -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
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH V5 2/2] kobject: drop newline from msg string
  2019-01-09  9:21   ` Rafael J. Wysocki
@ 2019-01-09  9:30     ` YU Bo
  0 siblings, 0 replies; 6+ messages in thread
From: YU Bo @ 2019-01-09  9:30 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Greg Kroah-Hartman, Linux Kernel Mailing List, Joe Perches, yuzibode

On Wed, Jan 09, 2019 at 10:21:37AM +0100, Rafael J. Wysocki wrote:
>On Wed, Jan 9, 2019 at 10:17 AM Bo YU <tsu.yubo@gmail.com> wrote:
>>
>> There is currently a missing terminating newline in non-switch case
>> match when msg == NULL
>>
>> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
>
>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.
>
>Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Thank you :)
>
>> ---
>> 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(-)
>>
>> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> index c87a96c4800e..f05802687ba4 100644
>> --- a/lib/kobject_uevent.c
>> +++ b/lib/kobject_uevent.c
>> @@ -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
>>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-01-09  9:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09  9:16 [PATCH V5 0/2] kobject: fix code style and drop newline Bo YU
2019-01-09  9:17 ` [PATCH V5 1/2] kobject: to repalce printk with pr_* style Bo YU
2019-01-09  9:20   ` Rafael J. Wysocki
2019-01-09  9:17 ` [PATCH V5 2/2] kobject: drop newline from msg string Bo YU
2019-01-09  9:21   ` Rafael J. Wysocki
2019-01-09  9:30     ` YU Bo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).