All of lore.kernel.org
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: David Ahern <dsahern@gmail.com>
Cc: Leon Romanovsky <leonro@mellanox.com>,
	netdev <netdev@vger.kernel.org>,
	RDMA mailing list <linux-rdma@vger.kernel.org>,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2-next 02/19] rdma: Remove duplicated print code
Date: Tue, 22 Jan 2019 20:31:08 +0200	[thread overview]
Message-ID: <20190122183125.15920-3-leon@kernel.org> (raw)
In-Reply-To: <20190122183125.15920-1-leon@kernel.org>

From: Leon Romanovsky <leonro@mellanox.com>

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 <leonro@mellanox.com>
---
 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

  parent reply	other threads:[~2019-01-22 18:31 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-22 18:31 [PATCH iproute2-next 00/19] Export object IDs to users Leon Romanovsky
2019-01-22 18:31 ` Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 01/19] rdma: update uapi headers Leon Romanovsky
2019-01-22 18:31 ` Leon Romanovsky [this message]
2019-01-22 18:31 ` [PATCH iproute2-next 03/19] rdma: Provide unique indexes for all visible objects Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 04/19] rdma: Provide parent context index for all objects except CM_ID Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 05/19] rdma: Move resource PD logic to separate file Leon Romanovsky
2019-01-25 17:19   ` David Ahern
2019-01-27  8:29     ` Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 06/19] rdma: Refactor out resource MR " Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 07/19] rdma: Move out resource CQ " Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 08/19] rdma: Move out resource CM-ID " Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 09/19] rdma: Move resource PD " Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 10/19] rdma: Properly mark RDMAtool license Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 11/19] rdma: Simplify code to reuse existing functions Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 12/19] rdma: Simplify CM_ID print code Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 13/19] rdma: Refactor CQ prints Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 14/19] rdma: Separate MR code Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 15/19] rdma: Separate PD code Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 16/19] rdma: Move QP code to separate function Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 17/19] rdma: Unify netlink attribute checks prior to prints Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 18/19] rdma: Perform single .doit call to query specific objects Leon Romanovsky
2019-01-22 18:31 ` [PATCH iproute2-next 19/19] rdma: Provide and reuse filter functions Leon Romanovsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190122183125.15920-3-leon@kernel.org \
    --to=leon@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=leonro@mellanox.com \
    --cc=linux-rdma@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.