DPDK patches and discussions
 help / color / mirror / Atom feed
From: John Daley <johndale@cisco.com>
To: ferruh.yigit@intel.com, arybchenko@solarflare.com
Cc: thomas@monjalon.net, dev@dpdk.org,
	John Daley <johndale@cisco.com>,
	Hyong Youb Kim <hyonkim@cisco.com>
Subject: [dpdk-dev] [PATCH v2] net/enic: use RTE min and max macros
Date: Tue, 21 Jan 2020 12:35:07 -0800	[thread overview]
Message-ID: <20200121203507.5798-1-johndale@cisco.com> (raw)
In-Reply-To: <20200114002451.16248-3-johndale@cisco.com>

Use the RTE_MIN and RTE_MAX macros instead of private macros.

Signed-off-by: John Daley <johndale@cisco.com>
Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>
---

v2 - remove the min_t and max_t macros all together

 drivers/net/enic/enic_compat.h | 10 ----------
 drivers/net/enic/enic_res.c    | 20 ++++++++------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/drivers/net/enic/enic_compat.h b/drivers/net/enic/enic_compat.h
index eb1fc941e4..7741273037 100644
--- a/drivers/net/enic/enic_compat.h
+++ b/drivers/net/enic/enic_compat.h
@@ -73,14 +73,4 @@ static inline void writel(unsigned int val, volatile void __iomem *addr)
 	rte_write32(val, addr);
 }
 
-#define min_t(type, x, y) ({                    \
-	type __min1 = (x);                      \
-	type __min2 = (y);                      \
-	__min1 < __min2 ? __min1 : __min2; })
-
-#define max_t(type, x, y) ({                    \
-	type __max1 = (x);                      \
-	type __max2 = (y);                      \
-	__max1 > __max2 ? __max1 : __max2; })
-
 #endif /* _ENIC_COMPAT_H_ */
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index d72bef233b..20888eb257 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -68,8 +68,8 @@ int enic_get_vnic_config(struct enic *enic)
 	if (c->mtu == 0)
 		c->mtu = 1500;
 
-	enic->rte_dev->data->mtu = min_t(uint16_t, enic->max_mtu,
-					 max_t(uint16_t, ENIC_MIN_MTU, c->mtu));
+	enic->rte_dev->data->mtu = RTE_MIN(enic->max_mtu,
+				RTE_MAX((uint16_t)ENIC_MIN_MTU, c->mtu));
 
 	enic->adv_filters = vnic_dev_capable_adv_filters(enic->vdev);
 	dev_info(enic, "Advanced Filters %savailable\n", ((enic->adv_filters)
@@ -100,20 +100,16 @@ int enic_get_vnic_config(struct enic *enic)
 		((enic->filter_actions & FILTER_ACTION_COUNTER_FLAG) ?
 		 "count " : ""));
 
-	c->wq_desc_count =
-		min_t(uint32_t, ENIC_MAX_WQ_DESCS,
-		max_t(uint32_t, ENIC_MIN_WQ_DESCS,
-		c->wq_desc_count));
+	c->wq_desc_count = RTE_MIN((uint32_t)ENIC_MAX_WQ_DESCS,
+			RTE_MAX((uint32_t)ENIC_MIN_WQ_DESCS, c->wq_desc_count));
 	c->wq_desc_count &= 0xffffffe0; /* must be aligned to groups of 32 */
 
-	c->rq_desc_count =
-		min_t(uint32_t, ENIC_MAX_RQ_DESCS,
-		max_t(uint32_t, ENIC_MIN_RQ_DESCS,
-		c->rq_desc_count));
+	c->rq_desc_count = RTE_MIN((uint32_t)ENIC_MAX_RQ_DESCS,
+			RTE_MAX((uint32_t)ENIC_MIN_RQ_DESCS, c->rq_desc_count));
 	c->rq_desc_count &= 0xffffffe0; /* must be aligned to groups of 32 */
 
-	c->intr_timer_usec = min_t(uint32_t, c->intr_timer_usec,
-		vnic_dev_get_intr_coal_timer_max(enic->vdev));
+	c->intr_timer_usec = RTE_MIN(c->intr_timer_usec,
+				  vnic_dev_get_intr_coal_timer_max(enic->vdev));
 
 	dev_info(enic_get_dev(enic),
 		"vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
-- 
2.22.0


  parent reply	other threads:[~2020-01-21 20:35 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-14  0:24 [dpdk-dev] [PATCH] net/enic: use standard RTE defines John Daley
2020-01-14  0:24 ` [dpdk-dev] [PATCH] net/enic: consolidate and remove some defines John Daley
2020-01-14 17:58   ` Ferruh Yigit
2020-01-14  0:24 ` [dpdk-dev] [PATCH] net/enic: move macro to the correct file John Daley
2020-01-14 17:59   ` Ferruh Yigit
2020-01-19 20:23   ` Thomas Monjalon
2020-01-21 19:49     ` John Daley (johndale)
2020-01-21 20:35   ` John Daley [this message]
2020-01-24 12:55     ` [dpdk-dev] [PATCH v2] net/enic: use RTE min and max macros Ferruh Yigit
2020-01-14 17:57 ` [dpdk-dev] [PATCH] net/enic: use standard RTE defines Ferruh Yigit

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=20200121203507.5798-1-johndale@cisco.com \
    --to=johndale@cisco.com \
    --cc=arybchenko@solarflare.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=hyonkim@cisco.com \
    --cc=thomas@monjalon.net \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).