From fe716d38024364900e1f9818154eb96eb2a6c460 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 28 Jul 2015 17:47:02 +0200 Subject: [PATCH] bnx2x: fix build with debug enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Build log: error: unused variable ‘cid’ error: ‘RTE_LOG_WARN’ undeclared error: expected ‘)’ before ‘sc’ There were unused variables defined for debug but not used in debug log because it was ifdef'ed a the wrong condition (RTE_LIBRTE_BNX2X_DEBUG_DRIVER). The warning were using WARN instead of WARNING. Some debug messages had some extra parameters. Signed-off-by: Thomas Monjalon --- drivers/net/bnx2x/bnx2x.c | 22 +++++++++++----------- drivers/net/bnx2x/bnx2x_logs.h | 2 +- drivers/net/bnx2x/ecore_init.h | 3 +-- drivers/net/bnx2x/ecore_sp.c | 12 ++++-------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 8aa9dd57f9..342bcb156a 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -4042,7 +4042,7 @@ static void bnx2x_attn_int_deasserted0(struct bnx2x_softc *sc, uint32_t attn) val &= ~AEU_INPUTS_ATTN_BITS_SPIO5; REG_WR(sc, reg_offset, val); - PMD_DRV_LOG(WARN, "SPIO5 hw attention"); + PMD_DRV_LOG(WARNING, "SPIO5 hw attention"); /* Fan failure attention */ elink_hw_reset_phy(&sc->link_params); @@ -4577,7 +4577,7 @@ int bnx2x_intr_legacy(struct bnx2x_softc *sc, int scan_fp) } if (unlikely(status)) { - PMD_DRV_LOG(WARN, + PMD_DRV_LOG(WARNING, "Unexpected fastpath status (0x%08x)!", status); } @@ -5777,7 +5777,7 @@ static int bnx2x_set_power_state(struct bnx2x_softc *sc, uint8_t state) /* If there is no power capability, silently succeed */ if (!(sc->devinfo.pcie_cap_flags & BNX2X_PM_CAPABLE_FLAG)) { - PMD_DRV_LOG(WARN, "No power capability"); + PMD_DRV_LOG(WARNING, "No power capability"); return 0; } @@ -6444,12 +6444,12 @@ bnx2x_pf_rx_q_prep(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp, /* validate rings have enough entries to cross high thresholds */ if (sc->dropless_fc && pause->bd_th_hi + FW_PREFETCH_CNT > sc->rx_ring_size) { - PMD_DRV_LOG(WARN, "rx bd ring threshold limit"); + PMD_DRV_LOG(WARNING, "rx bd ring threshold limit"); } if (sc->dropless_fc && pause->rcq_th_hi + FW_PREFETCH_CNT > USABLE_RCQ_ENTRIES(rxq)) { - PMD_DRV_LOG(WARN, "rcq ring threshold limit"); + PMD_DRV_LOG(WARNING, "rcq ring threshold limit"); } pause->pri_map = 1; @@ -7116,7 +7116,7 @@ void bnx2x_periodic_callout(struct bnx2x_softc *sc) { if ((sc->state != BNX2X_STATE_OPEN) || (atomic_load_acq_long(&sc->periodic_flags) == PERIODIC_STOP)) { - PMD_DRV_LOG(WARN, "periodic callout exit (state=0x%x)", + PMD_DRV_LOG(WARNING, "periodic callout exit (state=0x%x)", sc->state); return; } @@ -7563,7 +7563,7 @@ static uint32_t bnx2x_pcie_capability_read(struct bnx2x_softc *sc, int reg) return ret; } - PMD_DRV_LOG(WARN, "PCIe capability NOT FOUND!!!"); + PMD_DRV_LOG(WARNING, "PCIe capability NOT FOUND!!!"); return 0; } @@ -9118,13 +9118,13 @@ static int bnx2x_do_flr(struct bnx2x_softc *sc) /* only E2 and onwards support FLR */ if (CHIP_IS_E1x(sc)) { - PMD_DRV_LOG(WARN, "FLR not supported in E1H"); + PMD_DRV_LOG(WARNING, "FLR not supported in E1H"); return -1; } /* only bootcode REQ_BC_VER_4_INITIATE_FLR and onwards support flr */ if (sc->devinfo.bc_ver < REQ_BC_VER_4_INITIATE_FLR) { - PMD_DRV_LOG(WARN, + PMD_DRV_LOG(WARNING, "FLR not supported by BC_VER: 0x%08x", sc->devinfo.bc_ver); return -1; @@ -9498,7 +9498,7 @@ static void bnx2x_init_multi_cos(struct bnx2x_softc *sc) if (cos < sc->max_cos) { sc->prio_to_cos[pri] = cos; } else { - PMD_DRV_LOG(WARN, + PMD_DRV_LOG(WARNING, "Invalid COS %d for priority %d " "(max COS is %d), setting to 0", cos, pri, (sc->max_cos - 1)); @@ -11344,7 +11344,7 @@ static void bnx2x_link_reset(struct bnx2x_softc *sc) elink_lfa_reset(&sc->link_params, &sc->link_vars); } else { if (!CHIP_REV_IS_SLOW(sc)) { - PMD_DRV_LOG(WARN, + PMD_DRV_LOG(WARNING, "Bootcode is missing - cannot reset link"); } } diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h index 05f754dc12..d31c2538ef 100644 --- a/drivers/net/bnx2x/bnx2x_logs.h +++ b/drivers/net/bnx2x/bnx2x_logs.h @@ -37,7 +37,7 @@ #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) #endif -#ifdef RTE_LIBRTE_BNX2X_DEBUG_DRIVER +#ifdef RTE_LIBRTE_BNX2X_DEBUG #define PMD_DRV_LOG_RAW(level, fmt, args...) \ RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args) #else diff --git a/drivers/net/bnx2x/ecore_init.h b/drivers/net/bnx2x/ecore_init.h index 49236b218e..7fc5644bbb 100644 --- a/drivers/net/bnx2x/ecore_init.h +++ b/drivers/net/bnx2x/ecore_init.h @@ -799,8 +799,7 @@ static inline void ecore_clear_blocks_parity(struct bnx2x_softc *sc) reg_val = REG_RD(sc, ecore_blocks_parity_data[i]. sts_clr_addr); if (reg_val & reg_mask) - ECORE_MSG(sc, - "Parity errors in %s: 0x%x", + ECORE_MSG("Parity errors in %s: 0x%x", ecore_blocks_parity_data[i].name, reg_val & reg_mask); } diff --git a/drivers/net/bnx2x/ecore_sp.c b/drivers/net/bnx2x/ecore_sp.c index 661cd1fc1e..31ab8cf449 100644 --- a/drivers/net/bnx2x/ecore_sp.c +++ b/drivers/net/bnx2x/ecore_sp.c @@ -3008,8 +3008,7 @@ static int ecore_mcast_setup_e1h(struct bnx2x_softc *sc, break; case ECORE_MCAST_CMD_DEL: - ECORE_MSG(sc, - "Invalidating multicast MACs configuration"); + ECORE_MSG("Invalidating multicast MACs configuration"); /* clear the registry */ ECORE_MEMSET(o->registry.aprox_match.vec, 0, @@ -3741,8 +3740,7 @@ static int ecore_queue_comp_cmd(struct bnx2x_softc *sc __rte_unused, "illegal value for next tx_only: %d. max cos was %d", o->next_tx_only, o->max_cos); - ECORE_MSG(sc, - "Completing command %d for queue %d, setting state to %d", + ECORE_MSG("Completing command %d for queue %d, setting state to %d", cmd, o->cids[ECORE_PRIMARY_CID_INDEX], o->next_state); if (o->next_tx_only) /* print num tx-only if any exist */ @@ -4729,8 +4727,7 @@ ecore_func_state_change_comp(struct bnx2x_softc *sc __rte_unused, return ECORE_INVAL; } - ECORE_MSG(sc, - "Completing command %d for func %d, setting state to %d", + ECORE_MSG("Completing command %d for func %d, setting state to %d", cmd, ECORE_FUNC_ID(sc), o->next_state); o->state = o->next_state; @@ -5172,8 +5169,7 @@ static int ecore_func_send_afex_update(struct bnx2x_softc *sc, struct ecore_func * read and we will have to put a full memory barrier there * (inside ecore_sp_post()). */ - ECORE_MSG(sc, - "afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x", + ECORE_MSG("afex: sending func_update vif_id 0x%x dvlan 0x%x prio 0x%x", rdata->vif_id, rdata->afex_default_vlan, rdata->allowed_priorities); -- 2.20.1