All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Lendacky <thomas.lendacky@amd.com>
To: <netdev@vger.kernel.org>, <fengguang.wu@intel.com>,
	<davem@davemloft.net>
Cc: <kbuild-all@01.org>, <jet.chen@intel.com>
Subject: [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict
Date: Mon, 9 Jun 2014 09:19:32 -0500	[thread overview]
Message-ID: <20140609141931.30639.72028.stgit@tlendack-t1.amdoffice.net> (raw)

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

             reply	other threads:[~2014-06-09 14:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-09 14:19 Tom Lendacky [this message]
2014-06-09 14:25 ` [PATCH] amd-xgbe: Rename MAX_DMA_CHANNELS to avoid powerpc conflict David Laight
2014-06-09 15:17   ` Tom Lendacky
2014-06-10 13:07 ` Tom Lendacky
2014-06-11  7:57 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140609141931.30639.72028.stgit@tlendack-t1.amdoffice.net \
    --to=thomas.lendacky@amd.com \
    --cc=davem@davemloft.net \
    --cc=fengguang.wu@intel.com \
    --cc=jet.chen@intel.com \
    --cc=kbuild-all@01.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.