net/iavf/base: remove unnecessary compile option

Remove compile option INTEGRATED_VF.

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/iavf/base/iavf_adminq.c b/drivers/net/iavf/base/iavf_adminq.c
index 68c51da..ef352ac 100644 (file)
--- a/drivers/net/iavf/base/iavf_adminq.c
+++ b/drivers/net/iavf/base/iavf_adminq.c
@@ -262,14 +262,8 @@ STATIC enum iavf_status iavf_config_asq_regs(struct iavf_hw *hw)
        wr32(hw, hw->aq.asq.tail, 0);
 
        /* set starting point */
-#ifdef INTEGRATED_VF
-       if (iavf_is_vf(hw))
-               wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |
-                                         IAVF_VF_ATQLEN1_ATQENABLE_MASK));
-#else
        wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |
                                  IAVF_VF_ATQLEN1_ATQENABLE_MASK));
-#endif /* INTEGRATED_VF */
        wr32(hw, hw->aq.asq.bal, IAVF_LO_DWORD(hw->aq.asq.desc_buf.pa));
        wr32(hw, hw->aq.asq.bah, IAVF_HI_DWORD(hw->aq.asq.desc_buf.pa));
 
@@ -297,14 +291,8 @@ STATIC enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw)
        wr32(hw, hw->aq.arq.tail, 0);
 
        /* set starting point */
-#ifdef INTEGRATED_VF
-       if (iavf_is_vf(hw))
-               wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |
-                                         IAVF_VF_ARQLEN1_ARQENABLE_MASK));
-#else
        wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |
                                  IAVF_VF_ARQLEN1_ARQENABLE_MASK));
-#endif /* INTEGRATED_VF */
        wr32(hw, hw->aq.arq.bal, IAVF_LO_DWORD(hw->aq.arq.desc_buf.pa));
        wr32(hw, hw->aq.arq.bah, IAVF_HI_DWORD(hw->aq.arq.desc_buf.pa));
 
@@ -897,14 +885,7 @@ enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,
        }
 
        /* set next_to_use to head */
-#ifdef INTEGRATED_VF
-       if (!iavf_is_vf(hw))
-               ntu = rd32(hw, hw->aq.arq.head) & IAVF_PF_ARQH_ARQH_MASK;
-       else
-               ntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK;
-#else
        ntu = rd32(hw, hw->aq.arq.head) & IAVF_VF_ARQH1_ARQH_MASK;
-#endif /* INTEGRATED_VF */
        if (ntu == ntc) {
                /* nothing to do - shouldn't need to update ring's values */
                ret_code = IAVF_ERR_ADMIN_QUEUE_NO_WORK;

diff --git a/drivers/net/iavf/base/iavf_common.c b/drivers/net/iavf/base/iavf_common.c
index 926081e..53e8777 100644 (file)
--- a/drivers/net/iavf/base/iavf_common.c
+++ b/drivers/net/iavf/base/iavf_common.c
@@ -331,15 +331,10 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask, void *desc,
 bool iavf_check_asq_alive(struct iavf_hw *hw)
 {
        if (hw->aq.asq.len)
-#ifdef INTEGRATED_VF
-               if (iavf_is_vf(hw))
-                       return !!(rd32(hw, hw->aq.asq.len) &
-                               IAVF_VF_ATQLEN1_ATQENABLE_MASK);
-#else
                return !!(rd32(hw, hw->aq.asq.len) &
                        IAVF_VF_ATQLEN1_ATQENABLE_MASK);
-#endif /* INTEGRATED_VF */
-       return false;
+       else
+               return false;
 }
 
 /**

diff --git a/drivers/net/iavf/base/iavf_type.h b/drivers/net/iavf/base/iavf_type.h
index 487352f..c1910ff 100644 (file)
--- a/drivers/net/iavf/base/iavf_type.h
+++ b/drivers/net/iavf/base/iavf_type.h
@@ -20,14 +20,8 @@
 #define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) (_p); (_q); (_r); (_s);
 #define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) (_p); (_q); (_r); (_s); (_t);
 
-#ifndef LINUX_MACROS
-#ifndef BIT
 #define BIT(a) (1UL << (a))
-#endif /* BIT */
-#ifndef BIT_ULL
 #define BIT_ULL(a) (1ULL << (a))
-#endif /* BIT_ULL */
-#endif /* LINUX_MACROS */
 
 /* IAVF_MASK is a macro used on 32 bit registers */
 #define IAVF_MASK(mask, shift) (mask << shift)
@@ -56,9 +50,7 @@
 struct iavf_hw;
 typedef void (*IAVF_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);
 
-#ifndef ETH_ALEN
 #define ETH_ALEN       6
-#endif
 /* Data type manipulation macros. */
 #define IAVF_HI_DWORD(x)       ((u32)((((x) >> 16) >> 16) & 0xFFFFFFFF))
 #define IAVF_LO_DWORD(x)       ((u32)((x) & 0xFFFFFFFF))