| Message ID | 20240423144100.76522-1-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] net: e1000e & ixgbe: Remove PCI_HEADER_TYPE_MFD duplicates | expand |
> 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 <ilpo.jarvinen@linux.intel.com> > --- > drivers/net/ethernet/intel/e1000e/defines.h | 2 -- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/defines.h > b/drivers/net/ethernet/intel/e1000e/defines.h > index 23a58cada43a..5e2cfa73f889 100644 > --- a/drivers/net/ethernet/intel/e1000e/defines.h > +++ b/drivers/net/ethernet/intel/e1000e/defines.h > @@ -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 > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > index ed440dd0c4f9..897fe357b65b 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > @@ -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 > -- > 2.39.2 > Reviewed-by: Hariprasad Kelam <hkelam@marvell.com>
On 4/23/2024 7:40 AM, Ilpo Järvinen wrote: > 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 <ilpo.jarvinen@linux.intel.com> Thanks Ilpo! Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
On 23/04/2024 17:40, Ilpo Järvinen wrote: > 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 <ilpo.jarvinen@linux.intel.com> > --- > drivers/net/ethernet/intel/e1000e/defines.h | 2 -- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h > index 23a58cada43a..5e2cfa73f889 100644 > --- a/drivers/net/ethernet/intel/e1000e/defines.h > +++ b/drivers/net/ethernet/intel/e1000e/defines.h > @@ -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 > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > index ed440dd0c4f9..897fe357b65b 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h > @@ -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 Acked-by: Sasha Neftin <sasha.neftin@intel.com>
On 4/23/2024 17:40, Ilpo Järvinen wrote: > 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 <ilpo.jarvinen@linux.intel.com> > --- > drivers/net/ethernet/intel/e1000e/defines.h | 2 -- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - > 2 files changed, 3 deletions(-) Tested-by: Naama Meir <naamax.meir@linux.intel.com>
diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h index 23a58cada43a..5e2cfa73f889 100644 --- a/drivers/net/ethernet/intel/e1000e/defines.h +++ b/drivers/net/ethernet/intel/e1000e/defines.h @@ -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 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index ed440dd0c4f9..897fe357b65b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h @@ -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
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 <ilpo.jarvinen@linux.intel.com> --- drivers/net/ethernet/intel/e1000e/defines.h | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - 2 files changed, 3 deletions(-)