Re: [PATCH 1/5] staging: lustre: Remove unnecessary else after return

From: Joe Perches
Date: Mon Feb 27 2017 - 15:45:57 EST


On Tue, 2017-02-28 at 01:51 +0530, SIMRAN SINGHAL wrote:
> On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> > On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote:
> > > This patch fixes the checkpatch warning that else is not generally
> > > useful after a break or return.
> >
> > checkpatch doesn't actually warn for this style
> >
> > if (foo)
> > return bar;
> > else
> > return baz;
> >
>
> ok, My bad
> so, I have to change commit message as checkpatch doesn't warn for this style.

Perhaps better would be to leave them unchanged instead.

> > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
[]
> > > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr)
> > >
> > > if (!count)
> > > return -ENOENT;
> > > - else
> > > - return 0;
> > > + return 0;

There might be a case for this one.
error returns are generally in the form

{
[...]

err = func(...);
if (err < 0)
return err;

return 0;
}