summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-05-19 07:31:54 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 02:27:32 +0400
commit526be41625a8b2282d5720dcb19f927edbf193b4 (patch)
treea6b5e3e3f77cf1da966a071bb64f22bc37154717 /drivers/w1
parent59d4467be405316916a4087d5b02d99196eeef04 (diff)
downloadlinux-526be41625a8b2282d5720dcb19f927edbf193b4.tar.xz
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: Devendra Naga <devendra.aaru@gmail.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/w1.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 69075c3dfc73..79e488db5104 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -557,7 +557,7 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
struct w1_master *md = NULL;
struct w1_slave *sl = NULL;
char *event_owner, *name;
- int err;
+ int err = 0;
if (dev->driver == &w1_master_driver) {
md = container_of(dev, struct w1_master, dev);
@@ -576,19 +576,17 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
event_owner, name, dev_name(dev));
if (dev->driver != &w1_slave_driver || !sl)
- return 0;
+ goto end;
err = add_uevent_var(env, "W1_FID=%02X", sl->reg_num.family);
if (err)
- return err;
+ goto end;
err = add_uevent_var(env, "W1_SLAVE_ID=%024LX",
(unsigned long long)sl->reg_num.id);
- if (err)
- return err;
-
- return 0;
-};
+end:
+ return err;
+}
#else
static int w1_uevent(struct device *dev, struct kobj_uevent_env *env)
{