From 5cdcf9a3a1c06d47b3bc59b19bcdffc119d8c9e9 Mon Sep 17 00:00:00 2001 From: Tianfei Zhang Date: Mon, 14 May 2018 17:58:37 +0800 Subject: [PATCH] raw/ifpga/base: fix build with icc fix compile error on icc compiler Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code") Signed-off-by: Tianfei Zhang Tested-by: Pablo de Lara --- drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h index cd114fbeb9..7a39a580ce 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h +++ b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h @@ -16,16 +16,20 @@ get_port(struct ifpga_hw *hw, u32 port_id) return &hw->port[port_id]; } -#define ifpga_for_each_feature(hw, feature) \ +#define ifpga_for_each_fme_feature(hw, feature) \ for ((feature) = (hw)->sub_feature; \ (feature) < (hw)->sub_feature + (FME_FEATURE_ID_MAX); (feature)++) +#define ifpga_for_each_port_feature(hw, feature) \ + for ((feature) = (hw)->sub_feature; \ + (feature) < (hw)->sub_feature + (PORT_FEATURE_ID_MAX); (feature)++) + static inline struct feature * get_fme_feature_by_id(struct ifpga_fme_hw *fme, u64 id) { struct feature *feature; - ifpga_for_each_feature(fme, feature) { + ifpga_for_each_fme_feature(fme, feature) { if (feature->id == id) return feature; } @@ -38,7 +42,7 @@ get_port_feature_by_id(struct ifpga_port_hw *port, u64 id) { struct feature *feature; - ifpga_for_each_feature(port, feature) { + ifpga_for_each_port_feature(port, feature) { if (feature->id == id) return feature; } -- 2.20.1