All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Simek <monstr@monstr.eu>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/3 v2] net: emaclite: Use unsigned long for baseaddr
Date: Thu, 13 Oct 2011 11:23:21 +0200	[thread overview]
Message-ID: <1318497803-21874-2-git-send-email-monstr@monstr.eu> (raw)
In-Reply-To: <1318497803-21874-1-git-send-email-monstr@monstr.eu>

Baseaddr should be unsigned long.

Signed-off-by: Michal Simek <monstr@monstr.eu>

---
v2: Fix merge confict - no function change
---
 drivers/net/xilinx_emaclite.c |    4 ++--
 include/netdev.h              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index bb4fb01..ac3dae1 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -342,7 +342,7 @@ static int emaclite_recv(struct eth_device *dev)
 
 }
 
-int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
+int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr)
 {
 	struct eth_device *dev;
 	struct xemaclite *emaclite;
@@ -366,7 +366,7 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
 	emaclite->rxpp = 1;
 #endif
 
-	sprintf(dev->name, "Xelite.%x", base_addr);
+	sprintf(dev->name, "Xelite.%lx", base_addr);
 
 	dev->iobase = base_addr;
 	dev->init = emaclite_init;
diff --git a/include/netdev.h b/include/netdev.h
index 669f60b..a624677 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -97,7 +97,7 @@ int uli526x_initialize(bd_t *bis);
 int armada100_fec_register(unsigned long base_addr);
 int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
 							unsigned long dma_addr);
-int xilinx_emaclite_initialize (bd_t *bis, int base_addr);
+int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr);
 
 /* Boards with PCI network controllers can call this from their board_eth_init()
  * function to initialize whatever's on board.
-- 
1.7.5.4

  reply	other threads:[~2011-10-13  9:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-13  9:23 [U-Boot] [PATCH 0/3] Microblaze/Xilinx network driver changes Michal Simek
2011-10-13  9:23 ` Michal Simek [this message]
2011-10-13  9:23   ` [U-Boot] [PATCH 2/3 v2] net: emaclite: Move RX/TX ping pong initialization to Michal Simek
2011-10-13  9:23     ` [U-Boot] [PATCH 3/3] microblaze: Wire up axi_ethernet driver initialization Michal Simek
2011-10-23 20:16     ` [U-Boot] [PATCH 2/3 v2] net: emaclite: Move RX/TX ping pong initialization to Wolfgang Denk
2011-10-23 20:15   ` [U-Boot] [PATCH 1/3 v2] net: emaclite: Use unsigned long for baseaddr Wolfgang Denk

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=1318497803-21874-2-git-send-email-monstr@monstr.eu \
    --to=monstr@monstr.eu \
    --cc=u-boot@lists.denx.de \
    /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.