Commit 526be416 authored by Devendra Naga's avatar Devendra Naga Committed by Greg Kroah-Hartman

w1: cleanup w1_uevent

There were some return statements around in the w1_uevent, used goto
to cleanup those return statements with the help of err variable,
and also removed a semi colon at the end of the w1_uevent's closing
brace.
Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59d4467b
...@@ -557,7 +557,7 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -557,7 +557,7 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
struct w1_master *md = NULL; struct w1_master *md = NULL;
struct w1_slave *sl = NULL; struct w1_slave *sl = NULL;
char *event_owner, *name; char *event_owner, *name;
int err; int err = 0;
if (dev->driver == &w1_master_driver) { if (dev->driver == &w1_master_driver) {
md = container_of(dev, struct w1_master, dev); md = container_of(dev, struct w1_master, dev);
...@@ -576,19 +576,17 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -576,19 +576,17 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
event_owner, name, dev_name(dev)); event_owner, name, dev_name(dev));
if (dev->driver != &w1_slave_driver || !sl) if (dev->driver != &w1_slave_driver || !sl)
return 0; goto end;
err = add_uevent_var(env, "W1_FID=%02X", sl->reg_num.family); err = add_uevent_var(env, "W1_FID=%02X", sl->reg_num.family);
if (err) if (err)
return err; goto end;
err = add_uevent_var(env, "W1_SLAVE_ID=%024LX", err = add_uevent_var(env, "W1_SLAVE_ID=%024LX",
(unsigned long long)sl->reg_num.id); (unsigned long long)sl->reg_num.id);
if (err) end:
return err; return err;
}
return 0;
};
#else #else
static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment