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 <[email protected]>
---
drivers/w1/w1.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 9761950..a0d3c59 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)
{
--
1.7.9.5
Hi
On Fri, May 18, 2012 at 02:19:23PM +0530, Devendra Naga ([email protected]) wrote:
> 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.
I personally do not see whether this is better than what was before
So, Greg, it is up to you to decide :)
If you pull it in, then feel free to add my acked-by.
Thank you.
> Signed-off-by: Devendra Naga <[email protected]>
> ---
> drivers/w1/w1.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
> index 9761950..a0d3c59 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)
> {
> --
> 1.7.9.5
--
Evgeniy Polyakov
Mr Greg,
are you going to take this in?
Thanks,
Devendra.
On Sat, May 19, 2012 at 9:01 AM, Evgeniy Polyakov <[email protected]> wrote:
> Hi
>
> On Fri, May 18, 2012 at 02:19:23PM +0530, Devendra Naga ([email protected]) wrote:
>> 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.
>
> I personally do not see whether this is better than what was before
> So, Greg, it is up to you to decide :)
>
> If you pull it in, then feel free to add my acked-by.
> Thank you.
>
> ? ? ? ?Evgeniy Polyakov
On Mon, Jun 04, 2012 at 05:15:01PM +0530, devendra.aaru ([email protected]) wrote:
> Mr Greg,
>
> are you going to take this in?
Mister Greg, does it look ok, will you put it in? :)
--
Evgeniy Polyakov
On Mon, Jun 04, 2012 at 10:05:46PM +0400, Evgeniy Polyakov wrote:
> On Mon, Jun 04, 2012 at 05:15:01PM +0530, devendra.aaru ([email protected]) wrote:
> > Mr Greg,
> >
> > are you going to take this in?
>
> Mister Greg, does it look ok, will you put it in? :)
Yes, now that the merge window is open, I will queue it up.
thanks,
greg k-h
On Mon, Jun 04, 2012 at 11:53:16AM -0700, GregKH ([email protected]) wrote:
> > Mister Greg, does it look ok, will you put it in? :)
>
> Yes, now that the merge window is open, I will queue it up.
Thank you very many, mister Greg :)
--
Evgeniy Polyakov
On Tue, Jun 5, 2012 at 12:55 AM, Evgeniy Polyakov <[email protected]> wrote:
> On Mon, Jun 04, 2012 at 11:53:16AM -0700, GregKH ([email protected]) wrote:
>> > Mister Greg, does it look ok, will you put it in? :)
>>
>> Yes, now that the merge window is open, I will queue it up.
>
> Thank you very many, mister Greg :)
>
> --
> ? ? ? ?Evgeniy Polyakov
sorry if i hurt any of you :/
Devendra.
On Tue, Jun 05, 2012 at 03:13:43AM +0530, devendra.aaru ([email protected]) wrote:
> sorry if i hurt any of you :/
No hurt at all, no problem :))
--
Evgeniy Polyakov