net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates
Subsystems (3)
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
@@ -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
@@ -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
PATCH 1/1 net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates
Quoted 38 lines
PCI_HEADER_TYPE_MULTIFUNCis define by e1000e and ixgbe and both are unused. There is alreadyPCI_HEADER_TYPE_MFDinpci_regs.hanyway which should be used instead so remove the duplicated defines of it.Signed-off-by Ilpo Järvinen <[email protected]>--- 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@@ -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 0xFdrivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0
-0@@ -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_MULTIFUNC0x80#defineIXGBE_PCI_DEVICE_CONTROL2_16ms0x0005
Quoted 4 lines
#define
IXGBE_PCIDEVCTRL2_TIMEO_MASK0xf
--
2.39.2
Quoted 5 lines · Ilpo Järvinen
PCI_HEADER_TYPE_MULTIFUNCis define by e1000e and ixgbe and both are unused. There is alreadyPCI_HEADER_TYPE_MFDinpci_regs.hanyway which should be used instead so remove the duplicated defines of it.Signed-off-by Ilpo Järvinen <[email protected]>
Thanks Ilpo!
Quoted 28 lines · Ilpo Järvinen
PCI_HEADER_TYPE_MULTIFUNCis define by e1000e and ixgbe and both are unused. There is alreadyPCI_HEADER_TYPE_MFDinpci_regs.hanyway which should be used instead so remove the duplicated defines of it.Signed-off-by Ilpo Järvinen <[email protected]>--- 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@@ -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 0xFdrivers/net/ethernet/intel/ixgbe/ixgbe_type.h +0
-0
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
Quoted 9 lines · Ilpo Järvinen
PCI_HEADER_TYPE_MULTIFUNCis define by e1000e and ixgbe and both are unused. There is alreadyPCI_HEADER_TYPE_MFDinpci_regs.hanyway which should be used instead so remove the duplicated defines of it.Signed-off-by Ilpo Järvinen <[email protected]>--- drivers/net/ethernet/intel/e1000e/defines.h | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - 2 files changed, 3 deletions(-)