Commit 6918107e authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Tony Nguyen
Browse files

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: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 86167183

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

+0 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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