Skip to contentSkip to conversation

igc: remove IGC_REMOVED function

PATCH New Vitaly Lifshits 2 participants 4 messages Apr 1, 2020 – Apr 21, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 igc: remove IGC_REMOVED function

igc driver has leftovers from the previous device that supported virtualization. This can be found in the function IGC_REMOVED which became obsolete, and can be removed.

---
 drivers/net/ethernet/intel/igc/igc_mac.h  | 4 ----
 drivers/net/ethernet/intel/igc/igc_main.c | 3 ---
 drivers/net/ethernet/intel/igc/igc_regs.h | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)
drivers/net/ethernet/intel/igc/igc_mac.h +0 -4
index 832cccec87cd..b5963f86defb 100644
@@ -8,10 +8,6 @@
 #include "igc_phy.h"
 #include "igc_defines.h"
 
-#ifndef IGC_REMOVED
-#define IGC_REMOVED(a) (0)
-#endif /* IGC_REMOVED */
-
 /* forward declaration */
 s32 igc_disable_pcie_master(struct igc_hw *hw);
 s32 igc_check_for_copper_link(struct igc_hw *hw);
drivers/net/ethernet/intel/igc/igc_main.c +0 -3
index c3555148ca0e..cb0d523ffc19 100644
@@ -4662,9 +4662,6 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg)
 	u8 __iomem *hw_addr = READ_ONCE(hw->hw_addr);
 	u32 value = 0;
 
-	if (IGC_REMOVED(hw_addr))
-		return ~value;
-
 	value = readl(&hw_addr[reg]);
 
 	/* reads should not return all F's */
drivers/net/ethernet/intel/igc/igc_regs.h +1 -2
index 82158176634c..21b6fc42edbb 100644
@@ -277,8 +277,7 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg);
 #define wr32(reg, val) \
 do { \
 	u8 __iomem *hw_addr = READ_ONCE((hw)->hw_addr); \
-	if (!IGC_REMOVED(hw_addr)) \
-		writel((val), &hw_addr[(reg)]); \
+	writel((val), &hw_addr[(reg)]); \
 } while (0)
 
 #define rd32(reg) (igc_rd32(hw, reg))
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 igc: remove IGC_REMOVED function

Quoted 46 lines · Vitaly Lifshits

igc driver has leftovers from the previous device that supported virtualization. This can be found in the function IGC_REMOVED which became obsolete, and can be removed.

---
  drivers/net/ethernet/intel/igc/igc_mac.h  | 4 ----
  drivers/net/ethernet/intel/igc/igc_main.c | 3 ---
  drivers/net/ethernet/intel/igc/igc_regs.h | 3 +--
  3 files changed, 1 insertion(+), 9 deletions(-)
drivers/net/ethernet/intel/igc/igc_mac.h +0 -4
index 832cccec87cd..b5963f86defb 100644
@@ -8,10 +8,6 @@
  #include "igc_phy.h"
  #include "igc_defines.h"
 
-#ifndef IGC_REMOVED
-#define IGC_REMOVED(a) (0)
-#endif /* IGC_REMOVED */
-
  /* forward declaration */
  s32 igc_disable_pcie_master(struct igc_hw *hw);
  s32 igc_check_for_copper_link(struct igc_hw *hw);
drivers/net/ethernet/intel/igc/igc_main.c +0 -3
index c3555148ca0e..cb0d523ffc19 100644
@@ -4662,9 +4662,6 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg)
  	u8 __iomem *hw_addr = READ_ONCE(hw->hw_addr);
  	u32 value = 0;
 
-	if (IGC_REMOVED(hw_addr))
-		return ~value;
-
  	value = readl(&hw_addr[reg]);
 
  	/* reads should not return all F's */
drivers/net/ethernet/intel/igc/igc_regs.h +0 -0
index 82158176634c..21b6fc42edbb 100644

drivers/net/ethernet/intel/igc/igc_regs.h u32 igc_rd32(struct igc_hw *hw, u32 reg); · line 283

Quoted 9 lines
drivers/net/ethernet/intel/igc/igc_regs.h +1 -2
@@ -277,8 +277,7 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg);
  #define wr32(reg, val) \
  do { \
  	u8 __iomem *hw_addr = READ_ONCE((hw)->hw_addr); \
-	if (!IGC_REMOVED(hw_addr)) \
-		writel((val), &hw_addr[(reg)]); \
+	writel((val), &hw_addr[(reg)]); \
  } while (0)
 
  #define rd32(reg) (igc_rd32(hw, reg))
#2 lore raw

PATCH 1/1 igc: remove IGC_REMOVED function

Quoted 60 lines · Sasha
Quoted 45 lines · Vitaly Lifshits

igc driver has leftovers from the previous device that supported virtualization. This can be found in the function IGC_REMOVED which became obsolete, and can be removed.

---

? drivers/net/ethernet/intel/igc/igc_mac.h? | 4 ----
? drivers/net/ethernet/intel/igc/igc_main.c | 3 ---
? drivers/net/ethernet/intel/igc/igc_regs.h | 3 +--

? 3 files changed, 1 insertion(+), 9 deletions(-)

drivers/net/ethernet/intel/igc/igc_mac.h +0 -0
index 832cccec87cd..b5963f86defb 100644
@@ -8,10 +8,6 @@

? #include "igc_phy.h"
? #include "igc_defines.h"

drivers/net/ethernet/intel/igc/igc_mac.h +0 -4
-#ifndef IGC_REMOVED
-#define IGC_REMOVED(a) (0)
-#endif /* IGC_REMOVED */
-

? /* forward declaration */
? s32 igc_disable_pcie_master(struct igc_hw *hw); ? s32 igc_check_for_copper_link(struct igc_hw *hw);

drivers/net/ethernet/intel/igc/igc_main.c +0 -3
index c3555148ca0e..cb0d523ffc19 100644
@@ -4662,9 +4662,6 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg)
 ????? u8 __iomem *hw_addr = READ_ONCE(hw->hw_addr);
 ????? u32 value = 0;
-??? if (IGC_REMOVED(hw_addr))
-??????? return ~value;
-
 ????? value = readl(&hw_addr[reg]);

????? /* reads should not return all F's */

drivers/net/ethernet/intel/igc/igc_regs.h +0 -0
index 82158176634c..21b6fc42edbb 100644

drivers/net/ethernet/intel/igc/igc_regs.h u32 igc_rd32(struct igc_hw *hw, u32 reg); · line 283

Quoted 9 lines
drivers/net/ethernet/intel/igc/igc_regs.h +1 -2
@@ -277,8 +277,7 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg);
 ? #define wr32(reg, val) \
 ? do { \
 ????? u8 __iomem *hw_addr = READ_ONCE((hw)->hw_addr); \
-??? if (!IGC_REMOVED(hw_addr)) \
-??????? writel((val), &hw_addr[(reg)]); \
+??? writel((val), &hw_addr[(reg)]); \
 ? } while (0)
 ? #define rd32(reg) (igc_rd32(hw, reg))
 

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#3 lore raw

PATCH 1/1 igc: remove IGC_REMOVED function

In reply to Vitaly Lifshits
Quoted 10 lines

From: Intel-wired-lan <[email protected]> On Behalf Of Vitaly Lifshits
Sent: Wednesday, April 1, 2020 2:17 AM
To: intel-wired-lan at osuosl.org
Subject: [Intel-wired-lan] [PATCH v1] igc: remove IGC_REMOVED function

igc driver has leftovers from the previous device that supported virtualization. This can be found in the function IGC_REMOVED which became obsolete, and can be removed.

Quoted 6 lines
---
 drivers/net/ethernet/intel/igc/igc_mac.h  | 4 ----
 drivers/net/ethernet/intel/igc/igc_main.c | 3 ---
 drivers/net/ethernet/intel/igc/igc_regs.h | 3 +--
 3 files changed, 1 insertion(+), 9 deletions(-)