Skip to content

Commit 6918107

Browse files
ij-intelanguy11
authored andcommitted
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. Signed-off-by: Ilpo Järvinen <[email protected]> Reviewed-by: Hariprasad Kelam <[email protected]> Reviewed-by: Jesse Brandeburg <[email protected]> Acked-by: Sasha Neftin <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 8616718 commit 6918107

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

drivers/net/ethernet/intel/e1000e/defines.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,6 @@
679679
/* PCI/PCI-X/PCI-EX Config space */
680680
#define PCI_HEADER_TYPE_REGISTER 0x0E
681681

682-
#define PCI_HEADER_TYPE_MULTIFUNC 0x80
683-
684682
#define PHY_REVISION_MASK 0xFFFFFFF0
685683
#define MAX_PHY_REG_ADDRESS 0x1F /* 5 bit address bus (0-0x1F) */
686684
#define MAX_PHY_MULTI_PAGE_REG 0xF

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,6 @@ enum {
21792179
#define IXGBE_PCI_LINK_SPEED_5000 0x2
21802180
#define IXGBE_PCI_LINK_SPEED_8000 0x3
21812181
#define IXGBE_PCI_HEADER_TYPE_REGISTER 0x0E
2182-
#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
21832182
#define IXGBE_PCI_DEVICE_CONTROL2_16ms 0x0005
21842183

21852184
#define IXGBE_PCIDEVCTRL2_TIMEO_MASK 0xf

0 commit comments

Comments
 (0)