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,URIBL_BLOCKED,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 362B8C43381 for ; Sat, 23 Feb 2019 09:15:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2C6820850 for ; Sat, 23 Feb 2019 09:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550913353; bh=zwCnGLuww8ehZGoT6pu/DgQVugpKZ9J7EMJU0+iHObs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZNJGVY+HxXhtp2l2iwoAzcUClphNe+twPyNs2HQYWD05+gtafqghL4gM/vbFQpMZb ZxgxhCtVJ98n56uJJSR0GpfVHfTwGQNj+gvXVaBIFGDzeG7uK/pAl8D3dyjvzkubXD QnSEKUFIz4ECpkCeWubM5K94O2sHEMv0WiXZg8LY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726122AbfBWJPk (ORCPT ); Sat, 23 Feb 2019 04:15:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:53980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725859AbfBWJPk (ORCPT ); Sat, 23 Feb 2019 04:15:40 -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 189B1206BA; Sat, 23 Feb 2019 09:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550913339; bh=zwCnGLuww8ehZGoT6pu/DgQVugpKZ9J7EMJU0+iHObs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bX0zonC6aZSdL2iY5d/Nvm+oupCVOA1saXGiMLmOIyuA8IThxNVKuWCK8gQJ6Nxh6 EHgpN+ESnsIOjT3uOqkSWzX4cssoPNEH6EzjsW0hZ5VyZTHccu/Bqw7FcvOYYYzJCh 31HQOw/W+ASjGhLZnCltUda2jl0rEGPRwqs5vLU4= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , RDMA mailing list , Stephen Hemminger , Steve Wise Subject: [PATCH iproute2-next v2 02/19] rdma: Remove duplicated print code Date: Sat, 23 Feb 2019 11:15:11 +0200 Message-Id: <20190223091528.8509-3-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190223091528.8509-1-leon@kernel.org> References: <20190223091528.8509-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. Reviewed-by: Steve Wise 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