Commit eccd5403 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jakub Kicinski

drivers: net: xilinx_emaclite: Fix -Wpointer-to-int-cast warnings with W=1

drivers/net/ethernet//xilinx/xilinx_emaclite.c:341:35: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
  341 |   addr = (void __iomem __force *)((u32 __force)addr ^

Use uintptr_t instead of u32 to avoid problems on 64 bit systems.

Also, cast the address to an unsigned long for printing.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 27b42557
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
#define ALIGNMENT 4 #define ALIGNMENT 4
/* BUFFER_ALIGN(adr) calculates the number of bytes to the next alignment. */ /* BUFFER_ALIGN(adr) calculates the number of bytes to the next alignment. */
#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((u32)adr)) % ALIGNMENT) #define BUFFER_ALIGN(adr) ((ALIGNMENT - ((uintptr_t)adr)) % ALIGNMENT)
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#define xemaclite_readl ioread32be #define xemaclite_readl ioread32be
...@@ -338,7 +338,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, ...@@ -338,7 +338,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
* if it is configured in HW * if it is configured in HW
*/ */
addr = (void __iomem __force *)((u32 __force)addr ^ addr = (void __iomem __force *)((uintptr_t __force)addr ^
XEL_BUFFER_OFFSET); XEL_BUFFER_OFFSET);
reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET); reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET);
...@@ -399,7 +399,8 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) ...@@ -399,7 +399,8 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen)
* will correct on subsequent calls * will correct on subsequent calls
*/ */
if (drvdata->rx_ping_pong != 0) if (drvdata->rx_ping_pong != 0)
addr = (void __iomem __force *)((u32 __force)addr ^ addr = (void __iomem __force *)
((uintptr_t __force)addr ^
XEL_BUFFER_OFFSET); XEL_BUFFER_OFFSET);
else else
return 0; /* No data was available */ return 0; /* No data was available */
...@@ -1192,9 +1193,9 @@ static int xemaclite_of_probe(struct platform_device *ofdev) ...@@ -1192,9 +1193,9 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
} }
dev_info(dev, dev_info(dev,
"Xilinx EmacLite at 0x%08X mapped to 0x%08X, irq=%d\n", "Xilinx EmacLite at 0x%08X mapped to 0x%08lX, irq=%d\n",
(unsigned int __force)ndev->mem_start, (unsigned int __force)ndev->mem_start,
(unsigned int __force)lp->base_addr, ndev->irq); (unsigned long __force)lp->base_addr, ndev->irq);
return 0; return 0;
error: error:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment