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
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(-)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 63d0816ab23b..402765c3a9cb 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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
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(-)
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
Add a blank after declaration.
Signed-off-by: Bo YU <[email protected]>
---
lib/kobject_uevent.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 402765c3a9cb..27c6118afd1c 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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);
}
--
2.11.0
On Tue, 2018-10-30 at 08:01 -0400, Bo YU wrote:
> Fix warning from checkpatch.pl use pr_* to replace printk
If you look at msg, it can be unterminated with newline.
> diff --git 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);
Perhaps this block should be:
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 63d0816ab23b..0ba1197f366e 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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;
Hi,
On Tue, Oct 30, 2018 at 08:01:50AM -0700, Joe Perches wrote:
>On Tue, 2018-10-30 at 08:01 -0400, Bo YU wrote:
>> Fix warning from checkpatch.pl use pr_* to replace printk
>
>If you look at msg, it can be unterminated with newline.
>
>> diff --git 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);
>
>Perhaps this block should be:
>
>diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>index 63d0816ab23b..0ba1197f366e 100644
>--- a/lib/kobject_uevent.c
>+++ b/lib/kobject_uevent.c
>@@ -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;
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,
>
>
On Wed, 2018-10-31 at 09:41 -0400, YU Bo wrote:
> Hi,
> On Tue, Oct 30, 2018 at 08:01:50AM -0700, Joe Perches wrote:
> > On Tue, 2018-10-30 at 08:01 -0400, Bo YU wrote:
> > > Fix warning from checkpatch.pl use pr_* to replace printk
> >
> > If you look at msg, it can be unterminated with newline.
> >
> > > diff --git 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);
> >
> > Perhaps this block should be:
> >
> > diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> > index 63d0816ab23b..0ba1197f366e 100644
> > --- a/lib/kobject_uevent.c
> > +++ b/lib/kobject_uevent.c
> > @@ -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;
> 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.
> 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.
On Wed, Oct 31, 2018 at 09:48:15AM -0700, Joe Perches wrote:
>On Wed, 2018-10-31 at 09:41 -0400, YU Bo wrote:
>> Hi,
>> On Tue, Oct 30, 2018 at 08:01:50AM -0700, Joe Perches wrote:
>> > On Tue, 2018-10-30 at 08:01 -0400, Bo YU wrote:
>> > > Fix warning from checkpatch.pl use pr_* to replace printk
>> >
>> > If you look at msg, it can be unterminated with newline.
>> >
>> > > diff --git 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);
>> >
>> > Perhaps this block should be:
>> >
>> > diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> > index 63d0816ab23b..0ba1197f366e 100644
>> > --- a/lib/kobject_uevent.c
>> > +++ b/lib/kobject_uevent.c
>> > @@ -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;
>> 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.
>
>> 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.
>
>