From patchwork Mon Mar 27 07:06:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 743631 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vs4pd275yz9ryj for ; Mon, 27 Mar 2017 18:07:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752045AbdC0HHN (ORCPT ); Mon, 27 Mar 2017 03:07:13 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:45331 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbdC0HHK (ORCPT ); Mon, 27 Mar 2017 03:07:10 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v2R76lfV001899 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Mar 2017 07:06:47 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v2R76krE009242 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 27 Mar 2017 07:06:46 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v2R76ktt019531; Mon, 27 Mar 2017 07:06:46 GMT Received: from redman.cn.oracle.com (/10.113.194.127) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 27 Mar 2017 00:06:45 -0700 From: Zhu Yanjun To: yanjun.zhu@oracle.com, santosh.shilimkar@oracle.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, junxiao.bi@oracle.com, joe.jin@oracle.com Subject: [PATCH 3/5] rds: remove unnecessary returned value check Date: Mon, 27 Mar 2017 03:06:28 -0400 Message-Id: <1490598390-13812-4-git-send-email-yanjun.zhu@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490598390-13812-1-git-send-email-yanjun.zhu@oracle.com> References: <1490598390-13812-1-git-send-email-yanjun.zhu@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the function rds_stats_init, the returned value is always zero. As such, it is not necessary to check it. And change the return type to void. Signed-off-by: Zhu Yanjun --- net/rds/af_rds.c | 5 +---- net/rds/rds.h | 2 +- net/rds/stats.c | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index b405f77..a696096 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -658,9 +658,7 @@ static int rds_init(void) ret = rds_sysctl_init(); if (ret) goto out_threads; - ret = rds_stats_init(); - if (ret) - goto out_sysctl; + rds_stats_init(); ret = proto_register(&rds_proto, 1); if (ret) goto out_stats; @@ -677,7 +675,6 @@ static int rds_init(void) proto_unregister(&rds_proto); out_stats: rds_stats_exit(); -out_sysctl: rds_sysctl_exit(); out_threads: rds_threads_exit(); diff --git a/net/rds/rds.h b/net/rds/rds.h index 82d38cc..82a8856 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -870,7 +870,7 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_statistics, rds_stats); put_cpu(); \ } while (0) #define rds_stats_add(member, count) rds_stats_add_which(rds_stats, member, count) -int rds_stats_init(void); +void rds_stats_init(void); void rds_stats_exit(void); void rds_stats_info_copy(struct rds_info_iterator *iter, uint64_t *values, const char *const *names, diff --git a/net/rds/stats.c b/net/rds/stats.c index 73be187..e83b4bb 100644 --- a/net/rds/stats.c +++ b/net/rds/stats.c @@ -145,8 +145,7 @@ void rds_stats_exit(void) rds_info_deregister_func(RDS_INFO_COUNTERS, rds_stats_info); } -int rds_stats_init(void) +void rds_stats_init(void) { rds_info_register_func(RDS_INFO_COUNTERS, rds_stats_info); - return 0; }