From: Ferruh Yigit <ferruh.yigit@intel.com>
To: dev@dpdk.org
Cc: Rasesh Mody <rasesh.mody@qlogic.com>,
Harish Patil <harish.patil@qlogic.com>,
Sony Chacko <sony.chacko@qlogic.com>
Subject: [dpdk-dev] [PATCH v2] bnx2x: fix icc compilation error
Date: Mon, 27 Jun 2016 17:02:33 +0100 [thread overview]
Message-ID: <1467043353-22776-1-git-send-email-ferruh.yigit@intel.com> (raw)
In-Reply-To: <1465814839-31304-1-git-send-email-ferruh.yigit@intel.com>
Fix icc warning:
error #188: enumerated type mixed with another type
Fixed the code for simple cases caused the warning.
Still need to disable compiler warning because of more complex case.
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
drivers/net/bnx2x/Makefile | 4 ++++
drivers/net/bnx2x/elink.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
index 6f1f385..c2ddd8d 100644
--- 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
--- 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;
--
2.5.5
next prev parent reply other threads:[~2016-06-27 16:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 0:06 [dpdk-dev] [PATCH v5 1/5] bnx2x: fixed stats get Rasesh Mody
2016-05-12 0:06 ` [dpdk-dev] [PATCH v5 2/5] bnx2x: add xstats support Rasesh Mody
2016-06-28 14:34 ` Thomas Monjalon
2016-06-29 0:09 ` Rasesh Mody
2016-05-12 0:06 ` [dpdk-dev] [PATCH v5 3/5] bnx2x: restructure Tx routine Rasesh Mody
2016-05-12 0:06 ` [dpdk-dev] [PATCH v5 4/5] bnx2x: use single doorbell for TX Rasesh Mody
2016-05-12 0:06 ` [dpdk-dev] [PATCH v5 5/5] bnx2x: update driver version to 1.0.1.1 Rasesh Mody
2016-06-08 16:15 ` [dpdk-dev] [PATCH v5 1/5] bnx2x: fixed stats get Bruce Richardson
2016-06-10 10:08 ` Ferruh Yigit
2016-06-13 10:32 ` Ferruh Yigit
2016-06-13 10:47 ` [dpdk-dev] [PATCH] bnx2x: fix ICC compilation error Ferruh Yigit
2016-06-27 16:02 ` Ferruh Yigit [this message]
2016-06-27 23:21 ` [dpdk-dev] [PATCH v2] bnx2x: fix icc " Rasesh Mody
2016-06-29 9:53 ` Bruce Richardson
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=1467043353-22776-1-git-send-email-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=dev@dpdk.org \
--cc=harish.patil@qlogic.com \
--cc=rasesh.mody@qlogic.com \
--cc=sony.chacko@qlogic.com \
/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).