fm10k: convert NON_Q_VECTORS(hw) into NON_Q_VECTORS

The driver currently uses a macro to decide whether we should use
NON_Q_VECTORS_PF or NON_Q_VECTORS_VF.

However, we also define NON_Q_VECTORS_VF to the same value as
NON_Q_VECTORS_PF. This means that the macro NON_Q_VECTORS(hw) will
always return the same value.

Let's just remove this macro, and replace it directly with an enum value
on the enum non_q_vectors.

This was detected by cppcheck and fixes the following warnings when
building with BUILD=KERNEL

[fm10k_ethtool.c:1123]: (style) Same value in both branches of ternary
operator.

[fm10k_ethtool.c:1142]: (style) Same value in both branches of ternary
operator.

[fm10k_main.c:1826]: (style) Same value in both branches of ternary
operator.

[fm10k_main.c:1849]: (style) Same value in both branches of ternary
operator.

[fm10k_main.c:1858]: (style) Same value in both branches of ternary
operator.

[fm10k_pci.c:901]: (style) Same value in both branches of ternary
operator.

[fm10k_pci.c:1040]: (style) Same value in both branches of ternary
operator.

[fm10k_pci.c:1726]: (style) Same value in both branches of ternary
operator.

[fm10k_pci.c:1763]: (style) Same value in both branches of ternary
operator.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h
index 7d42582ed48dc36f3da8b6b670d1c4f8847ffa9b..b14441944b4b2ea04c8d962fc992e3bc41a0331c 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright(c) 2013 - 2018 Intel Corporation. */
+/* Copyright(c) 2013 - 2019 Intel Corporation. */
 
 #ifndef _FM10K_H_
 #define _FM10K_H_
@@ -177,14 +177,10 @@ static inline struct netdev_queue *txring_txq(const struct fm10k_ring *ring)
 #define MIN_Q_VECTORS  1
 enum fm10k_non_q_vectors {
        FM10K_MBX_VECTOR,
-#define NON_Q_VECTORS_VF NON_Q_VECTORS_PF
-       NON_Q_VECTORS_PF
+       NON_Q_VECTORS
 };
 
-#define NON_Q_VECTORS(hw)      (((hw)->mac.type == fm10k_mac_pf) ? \
-                                               NON_Q_VECTORS_PF : \
-                                               NON_Q_VECTORS_VF)
-#define MIN_MSIX_COUNT(hw)     (MIN_Q_VECTORS + NON_Q_VECTORS(hw))
+#define MIN_MSIX_COUNT(hw)     (MIN_Q_VECTORS + NON_Q_VECTORS)
 
 struct fm10k_q_vector {
        struct fm10k_intfc *interface;

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 1f7e4a8f4557f2cbd57bfd3edf7a8f5177fccfe9..c681d2d28107dd163415bc0b381b7d8508a5bb5c 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -1114,13 +1114,12 @@ static void fm10k_get_channels(struct net_device *dev,
                               struct ethtool_channels *ch)
 {
        struct fm10k_intfc *interface = netdev_priv(dev);
-       struct fm10k_hw *hw = &interface->hw;
 
        /* report maximum channels */
        ch->max_combined = fm10k_max_channels(dev);
 
        /* report info for other vector */
-       ch->max_other = NON_Q_VECTORS(hw);
+       ch->max_other = NON_Q_VECTORS;
        ch->other_count = ch->max_other;
 
        /* record RSS queues */
@@ -1132,14 +1131,13 @@ static int fm10k_set_channels(struct net_device *dev,
 {
        struct fm10k_intfc *interface = netdev_priv(dev);
        unsigned int count = ch->combined_count;
-       struct fm10k_hw *hw = &interface->hw;
 
        /* verify they are not requesting separate vectors */
        if (!count || ch->rx_count || ch->tx_count)
                return -EINVAL;
 
        /* verify other_count has not changed */
-       if (ch->other_count != NON_Q_VECTORS(hw))
+       if (ch->other_count != NON_Q_VECTORS)
                return -EINVAL;
 
        /* verify the number of channels does not exceed hardware limits */

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 17a96a49174b3a14f3a44baf99bffbfebcb8fe2b..e0a2be534b209cbe732a8a0ee21b39298204e2d8 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1824,7 +1824,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)
        v_budget = min_t(u16, v_budget, num_online_cpus());
 
        /* account for vectors not related to queues */
-       v_budget += NON_Q_VECTORS(hw);
+       v_budget += NON_Q_VECTORS;
 
        /* At the same time, hardware can only support a maximum of
         * hw.mac->max_msix_vectors vectors.  With features
@@ -1856,7 +1856,7 @@ static int fm10k_init_msix_capability(struct fm10k_intfc *interface)
        }
 
        /* record the number of queues available for q_vectors */
-       interface->num_q_vectors = v_budget - NON_Q_VECTORS(hw);
+       interface->num_q_vectors = v_budget - NON_Q_VECTORS;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 73928dbe714f4df6b6234af403ef87d47598ffd4..bb236fa440487baab2871285a99ce2402fa39cb1 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -898,7 +898,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface,
 
        /* Map interrupt */
        if (ring->q_vector) {
-               txint = ring->q_vector->v_idx + NON_Q_VECTORS(hw);
+               txint = ring->q_vector->v_idx + NON_Q_VECTORS;
                txint |= FM10K_INT_MAP_TIMER0;
        }
 
@@ -1037,7 +1037,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,
 
        /* Map interrupt */
        if (ring->q_vector) {
-               rxint = ring->q_vector->v_idx + NON_Q_VECTORS(hw);
+               rxint = ring->q_vector->v_idx + NON_Q_VECTORS;
                rxint |= FM10K_INT_MAP_TIMER1;
        }
 
@@ -1720,10 +1720,9 @@ int fm10k_mbx_request_irq(struct fm10k_intfc *interface)
 void fm10k_qv_free_irq(struct fm10k_intfc *interface)
 {
        int vector = interface->num_q_vectors;
-       struct fm10k_hw *hw = &interface->hw;
        struct msix_entry *entry;
 
-       entry = &interface->msix_entries[NON_Q_VECTORS(hw) + vector];
+       entry = &interface->msix_entries[NON_Q_VECTORS + vector];
 
        while (vector) {
                struct fm10k_q_vector *q_vector;
@@ -1760,7 +1759,7 @@ int fm10k_qv_request_irq(struct fm10k_intfc *interface)
        unsigned int ri = 0, ti = 0;
        int vector, err;
 
-       entry = &interface->msix_entries[NON_Q_VECTORS(hw)];
+       entry = &interface->msix_entries[NON_Q_VECTORS];
 
        for (vector = 0; vector < interface->num_q_vectors; vector++) {
                struct fm10k_q_vector *q_vector = interface->q_vector[vector];