| Message ID | 20140609141931.30639.72028.stgit@tlendack-t1.amdoffice.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tom Lendacky > MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc > architecture. Rename this #define in xgbe.h to avoid the > redefined warning issued during compilation. ... > --- a/drivers/net/ethernet/amd/xgbe/xgbe.h > +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h > @@ -138,7 +138,7 @@ > #define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) > #define RX_BUF_ALIGN 64 > > -#define MAX_DMA_CHANNELS 16 > +#define XGBE_MAX_DMA_CHANNELS 16 > #define DMA_ARDOMAIN_SETTING 0x2 > #define DMA_ARCACHE_SETTING 0xb > #define DMA_AWDOMAIN_SETTING 0x2 Might be worthwhile changing the other names at the same time. David
On 06/09/2014 09:25 AM, David Laight wrote: > From: Tom Lendacky >> MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc >> architecture. Rename this #define in xgbe.h to avoid the >> redefined warning issued during compilation. > ... >> --- a/drivers/net/ethernet/amd/xgbe/xgbe.h >> +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h >> @@ -138,7 +138,7 @@ >> #define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) >> #define RX_BUF_ALIGN 64 >> >> -#define MAX_DMA_CHANNELS 16 >> +#define XGBE_MAX_DMA_CHANNELS 16 >> #define DMA_ARDOMAIN_SETTING 0x2 >> #define DMA_ARCACHE_SETTING 0xb >> #define DMA_AWDOMAIN_SETTING 0x2 > > Might be worthwhile changing the other names at the same time. > I thought about that when creating this patch, but didn't want to take it too far - just resolve the reported issue. I'll submit a follow-on patch that renames the other defines if that is acceptable. Thanks, Tom > David > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David, I forgot to include net-next in the email summary for this patch. Let me know if you'd like me to re-submit it with the proper tree specified. I'll be sure to include it in the future. Thanks, Tom On 06/09/2014 09:19 AM, Tom Lendacky wrote: > MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc > architecture. Rename this #define in xgbe.h to avoid the > redefined warning issued during compilation. > > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> > --- > drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- > drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c > index b21f9b9..c83584a 100644 > --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c > +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c > @@ -230,7 +230,7 @@ static int xgbe_probe(struct platform_device *pdev) > DBGPR("--> xgbe_probe\n"); > > netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data), > - MAX_DMA_CHANNELS); > + XGBE_MAX_DMA_CHANNELS); > if (!netdev) { > dev_err(dev, "alloc_etherdev failed\n"); > ret = -ENOMEM; > diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h > index 9a5bfe6..ab06271 100644 > --- a/drivers/net/ethernet/amd/xgbe/xgbe.h > +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h > @@ -138,7 +138,7 @@ > #define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) > #define RX_BUF_ALIGN 64 > > -#define MAX_DMA_CHANNELS 16 > +#define XGBE_MAX_DMA_CHANNELS 16 > #define DMA_ARDOMAIN_SETTING 0x2 > #define DMA_ARCACHE_SETTING 0xb > #define DMA_AWDOMAIN_SETTING 0x2 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Tom Lendacky <thomas.lendacky@amd.com> Date: Mon, 9 Jun 2014 09:19:32 -0500 > MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc > architecture. Rename this #define in xgbe.h to avoid the > redefined warning issued during compilation. > > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index b21f9b9..c83584a 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -230,7 +230,7 @@ static int xgbe_probe(struct platform_device *pdev) DBGPR("--> xgbe_probe\n"); netdev = alloc_etherdev_mq(sizeof(struct xgbe_prv_data), - MAX_DMA_CHANNELS); + XGBE_MAX_DMA_CHANNELS); if (!netdev) { dev_err(dev, "alloc_etherdev failed\n"); ret = -ENOMEM; diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index 9a5bfe6..ab06271 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h @@ -138,7 +138,7 @@ #define RX_MIN_BUF_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) #define RX_BUF_ALIGN 64 -#define MAX_DMA_CHANNELS 16 +#define XGBE_MAX_DMA_CHANNELS 16 #define DMA_ARDOMAIN_SETTING 0x2 #define DMA_ARCACHE_SETTING 0xb #define DMA_AWDOMAIN_SETTING 0x2
MAX_DMA_CHANNELS is defined in asm/scatterlist.h of the powerpc architecture. Rename this #define in xgbe.h to avoid the redefined warning issued during compilation. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> --- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html