From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E595C43381 for ; Wed, 20 Feb 2019 07:22:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF5C02183F for ; Wed, 20 Feb 2019 07:22:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550647331; bh=OhqCrTdsDqnofR8ZJyovXxO84gCJOO5aEY8xgSPtVhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sRG/jIO1K7JbJ+nwj0J8rBG6F+sLHttxNZ2PexkFev1rDh0evZQDeAQQyIgCnIl8V hHRBArwVRcsY9wBaTdThm58rIU8XfTDXEdq1sCPOyTjS55HEe+xWE/+3nEyJ+sF+3M cPvxjxvTPluasinLAbIpnTl64ngDt9uODhz1BzaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730485AbfBTHWK (ORCPT ); Wed, 20 Feb 2019 02:22:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:36822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726064AbfBTHWI (ORCPT ); Wed, 20 Feb 2019 02:22:08 -0500 Received: from localhost (unknown [77.138.135.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 86B4B2146E; Wed, 20 Feb 2019 07:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550647328; bh=OhqCrTdsDqnofR8ZJyovXxO84gCJOO5aEY8xgSPtVhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEjIQfSxhqY02oLl5rLCnEfYnk147sDQ2oxGT8uc8PvNGoW5mmYaTAPD4+bpXRAPh I4ky46/Ctf7UKJ6DSW51uk16ZJ9+WpjW556dFn1DlF2UGw2hVJAd97bHgmass4Bcs/ uqfGBlToTt1NERLGLFxWkTgfHSapMKpf+AkN3I/c= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , RDMA mailing list , Stephen Hemminger Subject: [PATCH iproute2-next v1 02/19] rdma: Remove duplicated print code Date: Wed, 20 Feb 2019 09:21:19 +0200 Message-Id: <20190220072136.3840-3-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190220072136.3840-1-leon@kernel.org> References: <20190220072136.3840-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Leon Romanovsky There is no need to keep same print functions for uint32_t and uint64_t, unify them into one function. Signed-off-by: Leon Romanovsky --- rdma/res.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/rdma/res.c b/rdma/res.c index 6b0f5fe3..87865ec8 100644 --- a/rdma/res.c +++ b/rdma/res.c @@ -808,28 +808,20 @@ static int res_cq_parse_cb(const struct nlmsghdr *nlh, void *data) return MNL_CB_OK; } -static void print_key(struct rd *rd, const char *name, uint32_t val) +static void print_key(struct rd *rd, const char *name, uint64_t val) { if (rd->json_output) jsonw_xint_field(rd->jw, name, val); else - pr_out("%s 0x%x ", name, val); + pr_out("%s 0x%" PRIx64 " ", name, val); } -static void print_iova(struct rd *rd, uint64_t val) +static void res_print_uint(struct rd *rd, const char *name, uint64_t val) { if (rd->json_output) - jsonw_xint_field(rd->jw, "iova", val); + jsonw_uint_field(rd->jw, name, val); else - pr_out("iova 0x%" PRIx64 " ", val); -} - -static void print_mrlen(struct rd *rd, uint64_t val) -{ - if (rd->json_output) - jsonw_uint_field(rd->jw, "mrlen", val); - else - pr_out("mrlen %" PRIu64 " ", val); + pr_out("%s %" PRIu64 " ", name, val); } static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) @@ -907,8 +899,8 @@ static int res_mr_parse_cb(const struct nlmsghdr *nlh, void *data) if (nla_line[RDMA_NLDEV_ATTR_RES_LKEY]) print_key(rd, "lkey", lkey); if (nla_line[RDMA_NLDEV_ATTR_RES_IOVA]) - print_iova(rd, iova); - print_mrlen(rd, mrlen); + print_key(rd, "iova", iova); + res_print_uint(rd, "mrlen", mrlen); print_pid(rd, pid); print_comm(rd, comm, nla_line); -- 2.19.1