net/bnx2x: fix build with icc

Fix multiple icc issues of type:
	error #188: enumerated type mixed with another type

For simple cases, just fix the code causing the problem.
However, we still need to disable compiler warning because of
more complex cases.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Rasesh Mody <rasesh.mody@qlogic.com>

diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
index 6f1f385..c2ddd8d 100644 (file)
--- a/drivers/net/bnx2x/Makefile
+++ b/drivers/net/bnx2x/Makefile
@@ -14,6 +14,10 @@ EXPORT_MAP := rte_pmd_bnx2x_version.map
 
 LIBABIVER := 1
 
+ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
+CFLAGS += -wd188 #188: enumerated type mixed with another type
+endif
+
 #
 # all source are stored in SRCS-y
 #

diff --git a/drivers/net/bnx2x/elink.c b/drivers/net/bnx2x/elink.c
index b9149b8..149cc97 100644 (file)
--- a/drivers/net/bnx2x/elink.c
+++ b/drivers/net/bnx2x/elink.c
@@ -5029,7 +5029,7 @@ static elink_status_t elink_direct_parallel_detect_used(struct elink_phy *phy,
        if (status2_1000x & MDIO_SERDES_DIGITAL_A_1000X_STATUS2_AN_DISABLED) {
                PMD_DRV_LOG(DEBUG, "1G parallel detect link on port %d",
                            params->port);
-               return 1;
+               return ELINK_STATUS_ERROR;
        }
 
        CL22_RD_OVER_CL45(sc, phy,
@@ -5039,7 +5039,7 @@ static elink_status_t elink_direct_parallel_detect_used(struct elink_phy *phy,
        if (pd_10g & MDIO_10G_PARALLEL_DETECT_PAR_DET_10G_STATUS_PD_LINK) {
                PMD_DRV_LOG(DEBUG, "10G parallel detect link on port %d",
                            params->port);
-               return 1;
+               return ELINK_STATUS_ERROR;
        }
        return ELINK_STATUS_OK;
 }
@@ -6735,7 +6735,7 @@ static elink_status_t elink_8073_is_snr_needed(struct bnx2x_softc *sc,
        if (val != 0x102)
                return ELINK_STATUS_OK;
 
-       return 1;
+       return ELINK_STATUS_ERROR;
 }
 
 static elink_status_t elink_8073_xaui_wa(struct bnx2x_softc *sc,
@@ -7557,7 +7557,7 @@ static elink_status_t elink_read_sfp_module_eeprom(struct elink_phy *phy,
                                                   uint16_t byte_cnt,
                                                   uint8_t * o_buf)
 {
-       elink_status_t rc = 0;
+       elink_status_t rc = ELINK_STATUS_OK;
        uint8_t xfer_size;
        uint8_t *user_data = o_buf;
        read_sfp_module_eeprom_func_p read_func;