net/enic: move macro to the correct file
Checks
Commit Message
Move a macro from a widely included header file to a header file
used only by the one caller of the macro.
Signed-off-by: John Daley <johndale@cisco.com>
Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>
---
drivers/net/enic/enic_compat.h | 10 ----------
drivers/net/enic/enic_res.h | 11 ++++++++++-
2 files changed, 10 insertions(+), 11 deletions(-)
Comments
On 1/14/2020 12:24 AM, John Daley wrote:
> Move a macro from a widely included header file to a header file
> used only by the one caller of the macro.
>
> Signed-off-by: John Daley <johndale@cisco.com>
> Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>
Applied to dpdk-next-net/master, thanks.
14/01/2020 01:24, John Daley:
> +#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; })
Why not using RTE_MIN/RTE_MAX which use typeof?
You need to specify a type?
You are right, just need to cast #define parameters, then can use the RTE_MIN and MAX.
Will do a patch.
Thanks,
john
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Sunday, January 19, 2020 12:24 PM
> To: John Daley (johndale) <johndale@cisco.com>; Hyong Youb Kim
> (hyonkim) <hyonkim@cisco.com>
> Cc: ferruh.yigit@intel.com; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/enic: move macro to the correct file
>
> 14/01/2020 01:24, John Daley:
> > +#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; })
>
> Why not using RTE_MIN/RTE_MAX which use typeof?
> You need to specify a type?
>
@@ -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_ */
@@ -11,6 +11,16 @@
#include "vnic_wq.h"
#include "vnic_rq.h"
+#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; })
+
#define ENIC_MIN_WQ_DESCS 64
#define ENIC_MAX_WQ_DESCS 4096
#define ENIC_MIN_RQ_DESCS 64
@@ -55,7 +65,6 @@
#define ENIC_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
-
struct enic;
int enic_get_vnic_config(struct enic *);