[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID:
<PH0PR18MB4474F39D49346BCAD5535021DE102@PH0PR18MB4474.namprd18.prod.outlook.com>
Date: Wed, 24 Apr 2024 05:13:10 +0000
From: Hariprasad Kelam <hkelam@...vell.com>
To: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
Jesse
Brandeburg <jesse.brandeburg@...el.com>,
Tony Nguyen
<anthony.l.nguyen@...el.com>,
"David S. Miller" <davem@...emloft.net>,
Eric
Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni
<pabeni@...hat.com>,
"intel-wired-lan@...ts.osuosl.org"
<intel-wired-lan@...ts.osuosl.org>,
"netdev@...r.kernel.org"
<netdev@...r.kernel.org>,
"linux-kernel@...r.kernel.org"
<linux-kernel@...r.kernel.org>
Subject: [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.
>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@...ux.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@...vell.com>
Powered by blists - more mailing lists