Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759529AbbFBPuO (ORCPT ); Tue, 2 Jun 2015 11:50:14 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44870 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759268AbbFBPtb (ORCPT ); Tue, 2 Jun 2015 11:49:31 -0400 X-Sasl-enc: qs9LjjVPZiw44KgqJgwymy5UjAanbt08wCLN+Jg2OBJa 1433260170 From: Sergei Zviagintsev To: Greg Kroah-Hartman , Daniel Mack , David Herrmann , Djalal Harouni Cc: linux-kernel@vger.kernel.org, Sergei Zviagintsev Subject: [PATCH] kdbus: remove redundant code from kdbus_conn_entry_make() Date: Tue, 2 Jun 2015 18:48:48 +0300 Message-Id: <1433260130-1604-2-git-send-email-sergei@s15v.net> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1313 Lines: 42 We don't need to check `entry' for error, as in either case it is returned as is. Return result of kdbus_queue_entry_new() directly. Signed-off-by: Sergei Zviagintsev --- ipc/kdbus/connection.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c index ab476fa9ccca..b00872edbbc9 100644 --- a/ipc/kdbus/connection.c +++ b/ipc/kdbus/connection.c @@ -775,8 +775,6 @@ kdbus_conn_entry_make(struct kdbus_conn *conn_dst, const struct kdbus_kmsg *kmsg, struct kdbus_user *user) { - struct kdbus_queue_entry *entry; - /* The remote connection was disconnected */ if (!kdbus_conn_active(conn_dst)) return ERR_PTR(-ECONNRESET); @@ -793,11 +791,7 @@ kdbus_conn_entry_make(struct kdbus_conn *conn_dst, kmsg->res && kmsg->res->fds_count > 0) return ERR_PTR(-ECOMM); - entry = kdbus_queue_entry_new(conn_dst, kmsg, user); - if (IS_ERR(entry)) - return entry; - - return entry; + return kdbus_queue_entry_new(conn_dst, kmsg, user); } /* -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/