From patchwork Tue Jan 22 18:31:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 1029438 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="u3GlSPku"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43kcSv0vvKz9s3q for ; Wed, 23 Jan 2019 05:31:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726825AbfAVSbm (ORCPT ); Tue, 22 Jan 2019 13:31:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:54604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725971AbfAVSbl (ORCPT ); Tue, 22 Jan 2019 13:31:41 -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 4709621726; Tue, 22 Jan 2019 18:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548181900; bh=OhqCrTdsDqnofR8ZJyovXxO84gCJOO5aEY8xgSPtVhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u3GlSPkuW2fC/ykaeNOTIqyMkCgAyB92dG8rfqutZiB8PxIP372b8VgQdeOSdskxX nFhXp6LtTVgZanQrnoGQp4yxJ61Q3KXPNycLYfcH9wBFX9RLXgKqcAN4bStVNJujFp weTOdOFL+LOkBJjM9QgaF4cPrSHKAt2uUdySFaF0= From: Leon Romanovsky To: David Ahern Cc: Leon Romanovsky , netdev , RDMA mailing list , Stephen Hemminger Subject: [PATCH iproute2-next 02/19] rdma: Remove duplicated print code Date: Tue, 22 Jan 2019 20:31:08 +0200 Message-Id: <20190122183125.15920-3-leon@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190122183125.15920-1-leon@kernel.org> References: <20190122183125.15920-1-leon@kernel.org> MIME-Version: 1.0 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);