Patchwork [U-Boot,1/3,v2] net: emaclite: Use unsigned long for baseaddr

login
register
mail settings
Submitter Michal Simek
Date Oct. 13, 2011, 9:23 a.m.
Message ID <1318497803-21874-2-git-send-email-monstr@monstr.eu>
Download mbox | patch
Permalink /patch/119393/
State Accepted
Commit 9b94755af9552ce3cbecfdd2f9f1fa2b322d825a
Headers show

Comments

Michal Simek - Oct. 13, 2011, 9:23 a.m.
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(-)
Wolfgang Denk - Oct. 23, 2011, 8:15 p.m.
Dear Michal Simek,

In message <1318497803-21874-2-git-send-email-monstr@monstr.eu> you wrote:
> 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(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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.