On Thu, Oct 08, 2015 at 04:32:47PM +0200, David Herrmann wrote: > Hi > > On Thu, Oct 8, 2015 at 1:31 PM, Sergei Zviagintsev <ser...@s15v.net> wrote: > > Do not initialize `wait' and `name' as values are assigned to them at > > first use: `wait' gets its value from kdbus_reply_find(), `name' is set > > by kdbus_pin_dst(). > > > > Remove redundant code. goto isn't required as we reached exit point > > already. Setting `ret' to zero is unnecessary because > > kdbus_conn_entry_insert() returns 0 on success. > > > > Signed-off-by: Sergei Zviagintsev <ser...@s15v.net> > > --- > > ipc/kdbus/connection.c | 10 ++-------- > > 1 file changed, 2 insertions(+), 8 deletions(-) > > > > diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c > > index a4d7414ecaea..db49f282a1bf 100644 > > --- a/ipc/kdbus/connection.c > > +++ b/ipc/kdbus/connection.c > > @@ -1159,8 +1159,8 @@ static struct kdbus_reply *kdbus_conn_call(struct > > kdbus_conn *src, > > ktime_t exp) > > { > > const struct kdbus_msg *msg = staging->msg; > > - struct kdbus_name_entry *name = NULL; > > - struct kdbus_reply *wait = NULL; > > + struct kdbus_name_entry *name; > > + struct kdbus_reply *wait; > > struct kdbus_conn *dst = NULL; > > struct kdbus_bus *bus = src->ep->bus; > > int ret; > > @@ -1212,14 +1212,8 @@ static struct kdbus_reply *kdbus_conn_call(struct > > kdbus_conn *src, > > } > > > > /* send message */ > > - > > kdbus_bus_eavesdrop(bus, src, staging); > > - > > ret = kdbus_conn_entry_insert(src, dst, staging, wait, name); > > - if (ret < 0) > > - goto exit; > > - > > - ret = 0; > > Who says kdbus_conn_entry_insert() returns 0? It might be >0. I'd > prefer the explicit check.
That is clearly written in its kernel-doc and its code. In this particular case 'ret > 0' situation doesn't matter at all as we only do 'ret < 0' test latter and return `wait' var (the commit message isn't clear about that). > > Thanks > David > > > > > exit: > > up_read(&bus->name_registry->rwlock); > > -- > > 1.8.3.1 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/