Skip to contentSkip to conversation

net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates

PATCH In review Ilpo Järvinen 5 participants 5 messages Apr 23, 2024 – May 9, 2024

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

PATCH 1/1 net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates

PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which should be used instead so remove the duplicated defines of it.

---
 drivers/net/ethernet/intel/e1000e/defines.h   | 2 --
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 -
 2 files changed, 3 deletions(-)
drivers/net/ethernet/intel/e1000e/defines.h +0 -2
index 23a58cada43a..5e2cfa73f889 100644
@@ -679,8 +679,6 @@
 /* PCI/PCI-X/PCI-EX Config space */
 #define PCI_HEADER_TYPE_REGISTER     0x0E
 
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-
 #define PHY_REVISION_MASK      0xFFFFFFF0
 #define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
 #define MAX_PHY_MULTI_PAGE_REG 0xF
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -1
index ed440dd0c4f9..897fe357b65b 100644
@@ -2179,7 +2179,6 @@ enum {
 #define IXGBE_PCI_LINK_SPEED_5000 0x2
 #define IXGBE_PCI_LINK_SPEED_8000 0x3
 #define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
-#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
 #define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
 
 #define IXGBE_PCIDEVCTRL2_TIMEO_MASK	0xf
Signature · 1 line
2.39.2
#1 lore raw

PATCH 1/1 net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates

Quoted 38 lines

PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which should be used instead so remove the duplicated defines of it.

---
 drivers/net/ethernet/intel/e1000e/defines.h   | 2 --
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 -
 2 files changed, 3 deletions(-)
drivers/net/ethernet/intel/e1000e/defines.h +0 -2
index 23a58cada43a..5e2cfa73f889 100644
@@ -679,8 +679,6 @@
 /* PCI/PCI-X/PCI-EX Config space */
 #define PCI_HEADER_TYPE_REGISTER     0x0E
 
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-
 #define PHY_REVISION_MASK      0xFFFFFFF0
 #define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
 #define MAX_PHY_MULTI_PAGE_REG 0xF
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -0
index ed440dd0c4f9..897fe357b65b 100644
@@ -2179,7 +2179,6 @@ enum {
 #define IXGBE_PCI_LINK_SPEED_5000 0x2
 #define IXGBE_PCI_LINK_SPEED_8000 0x3
 #define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E -#define

IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80 #define
IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005

Quoted 4 lines

#define IXGBE_PCIDEVCTRL2_TIMEO_MASK 0xf
--
2.39.2

Acked-by on v1 1/1
#3 lore raw
In reply to Ilpo Järvinen
Quoted 28 lines · Ilpo Järvinen

PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which should be used instead so remove the duplicated defines of it.

---
  drivers/net/ethernet/intel/e1000e/defines.h   | 2 --
  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 -
  2 files changed, 3 deletions(-)
drivers/net/ethernet/intel/e1000e/defines.h +0 -2
index 23a58cada43a..5e2cfa73f889 100644
@@ -679,8 +679,6 @@
  /* PCI/PCI-X/PCI-EX Config space */
  #define PCI_HEADER_TYPE_REGISTER     0x0E
 
-#define PCI_HEADER_TYPE_MULTIFUNC    0x80
-
  #define PHY_REVISION_MASK      0xFFFFFFF0
  #define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
  #define MAX_PHY_MULTI_PAGE_REG 0xF
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -0
index ed440dd0c4f9..897fe357b65b 100644

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h enum { · line 2184

Quoted 7 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0 -1
@@ -2179,7 +2179,6 @@ enum {
  #define IXGBE_PCI_LINK_SPEED_5000 0x2
  #define IXGBE_PCI_LINK_SPEED_8000 0x3
  #define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
-#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
  #define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
 
  #define IXGBE_PCIDEVCTRL2_TIMEO_MASK	0xf
Tested-by on v1 1/1
#4 lore raw
In reply to Ilpo Järvinen
Quoted 9 lines · Ilpo Järvinen

PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which should be used instead so remove the duplicated defines of it.

---
  drivers/net/ethernet/intel/e1000e/defines.h   | 2 --
  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 -
  2 files changed, 3 deletions(-)