net/sfc/base: fix warnings from VS2015 C compiler (C4189)

Fix multiple level 4 warnings
"C4189: 'xxx': local variable is initialized but not referenced";
no functional changes.

Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base")
Fixes: dfb3b1ce15f6 ("net/sfc/base: import monitors access via MCDI")
Fixes: e7cd430c864f ("net/sfc/base: import SFN7xxx family support")
Cc: stable@dpdk.org
Signed-off-by: Andrew Lee <alee@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c
index e3a91c2..ee576a0 100644 (file)
--- a/drivers/net/sfc/base/ef10_ev.c
+++ b/drivers/net/sfc/base/ef10_ev.c
@@ -575,7 +575,7 @@ ef10_ev_qdestroy(
        EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON ||
            enp->en_family == EFX_FAMILY_MEDFORD);
 
-       (void) efx_mcdi_fini_evq(eep->ee_enp, eep->ee_index);
+       (void) efx_mcdi_fini_evq(enp, eep->ee_index);
 }
 
        __checkReturn   efx_rc_t
@@ -1346,9 +1346,12 @@ ef10_ev_rxlabel_init(
        __in            efx_rxq_type_t type)
 {
        efx_evq_rxq_state_t *eersp;
+#if EFSYS_OPT_RX_PACKED_STREAM
        boolean_t packed_stream = (type >= EFX_RXQ_TYPE_PACKED_STREAM_1M) &&
            (type <= EFX_RXQ_TYPE_PACKED_STREAM_64K);
+#endif
 
+       _NOTE(ARGUNUSED(type))
        EFSYS_ASSERT3U(label, <, EFX_ARRAY_SIZE(eep->ee_rxq_state));
        eersp = &eep->ee_rxq_state[label];
 
@@ -1386,8 +1389,6 @@ ef10_ev_rxlabel_init(
                EFSYS_ASSERT3U(eersp->eers_rx_packed_stream_credits, <=,
                    EFX_RX_PACKED_STREAM_MAX_CREDITS);
        }
-#else
-       EFSYS_ASSERT(!packed_stream);
 #endif
 }
 

diff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c
index e0f6ba2..7515aae 100644 (file)
--- a/drivers/net/sfc/base/efx_ev.c
+++ b/drivers/net/sfc/base/efx_ev.c
@@ -223,14 +223,14 @@ efx_ev_qcreate(
        __deref_out     efx_evq_t **eepp)
 {
        const efx_ev_ops_t *eevop = enp->en_eevop;
-       efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        efx_evq_t *eep;
        efx_rc_t rc;
 
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_EV);
 
-       EFSYS_ASSERT3U(enp->en_ev_qcount + 1, <, encp->enc_evq_limit);
+       EFSYS_ASSERT3U(enp->en_ev_qcount + 1, <,
+           enp->en_nic_cfg.enc_evq_limit);
 
        switch (flags & EFX_EVQ_FLAGS_NOTIFY_MASK) {
        case EFX_EVQ_FLAGS_NOTIFY_INTERRUPT:

diff --git a/drivers/net/sfc/base/efx_tx.c b/drivers/net/sfc/base/efx_tx.c
index a68babc..0cdf7e1 100644 (file)
--- a/drivers/net/sfc/base/efx_tx.c
+++ b/drivers/net/sfc/base/efx_tx.c
@@ -298,14 +298,14 @@ efx_tx_qcreate(
        __out           unsigned int *addedp)
 {
        const efx_tx_ops_t *etxop = enp->en_etxop;
-       efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        efx_txq_t *etp;
        efx_rc_t rc;
 
        EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
        EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_TX);
 
-       EFSYS_ASSERT3U(enp->en_tx_qcount + 1, <, encp->enc_txq_limit);
+       EFSYS_ASSERT3U(enp->en_tx_qcount + 1, <,
+           enp->en_nic_cfg.enc_txq_limit);
 
        /* Allocate an TXQ object */
        EFSYS_KMEM_ALLOC(enp->en_esip, sizeof (efx_txq_t), etp);

diff --git a/drivers/net/sfc/base/mcdi_mon.c b/drivers/net/sfc/base/mcdi_mon.c
index a083eac..8ea4216 100644 (file)
--- a/drivers/net/sfc/base/mcdi_mon.c
+++ b/drivers/net/sfc/base/mcdi_mon.c
@@ -264,7 +264,6 @@ mcdi_mon_ev(
        __out                           efx_mon_stat_value_t *valuep)
 {
        efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
-       efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
        uint16_t port_mask;
        uint16_t sensor;
        uint16_t state;
@@ -280,11 +279,13 @@ mcdi_mon_ev(
        value = (uint16_t)MCDI_EV_FIELD(eqp, SENSOREVT_VALUE);
 
        /* Hardware must support this MCDI sensor */
-       EFSYS_ASSERT3U(sensor, <, (8 * encp->enc_mcdi_sensor_mask_size));
+       EFSYS_ASSERT3U(sensor, <,
+           (8 * enp->en_nic_cfg.enc_mcdi_sensor_mask_size));
        EFSYS_ASSERT((sensor % MCDI_MON_PAGE_SIZE) != MC_CMD_SENSOR_PAGE0_NEXT);
-       EFSYS_ASSERT(encp->enc_mcdi_sensor_maskp != NULL);
-       EFSYS_ASSERT((encp->enc_mcdi_sensor_maskp[sensor / MCDI_MON_PAGE_SIZE] &
-               (1U << (sensor % MCDI_MON_PAGE_SIZE))) != 0);
+       EFSYS_ASSERT(enp->en_nic_cfg.enc_mcdi_sensor_maskp != NULL);
+       EFSYS_ASSERT(
+           (enp->en_nic_cfg.enc_mcdi_sensor_maskp[sensor/MCDI_MON_PAGE_SIZE] &
+           (1U << (sensor % MCDI_MON_PAGE_SIZE))) != 0);
 
        /* But we don't have to understand it */
        if (sensor >= EFX_ARRAY_SIZE(mcdi_sensor_map)) {