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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 2c98e4cc07a5b94f54d831af65240867edc61370..008b9a40faadb8b9d2063d1e3e8d5353e53ad9a4 100644 (file)
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -97,7 +97,7 @@
 #define ALIGNMENT              4
 
 /* 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
 #define xemaclite_readl                ioread32be
@@ -338,7 +338,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
                 * if it is configured in HW
                 */
 
-               addr = (void __iomem __force *)((u32 __force)addr ^
+               addr = (void __iomem __force *)((uintptr_t __force)addr ^
                                                 XEL_BUFFER_OFFSET);
                reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET);
 
@@ -399,8 +399,9 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen)
                 * will correct on subsequent calls
                 */
                if (drvdata->rx_ping_pong != 0)
-                       addr = (void __iomem __force *)((u32 __force)addr ^
-                                                        XEL_BUFFER_OFFSET);
+                       addr = (void __iomem __force *)
+                               ((uintptr_t __force)addr ^
+                                XEL_BUFFER_OFFSET);
                else
                        return 0;       /* No data was available */
 
@@ -1192,9 +1193,9 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
        }
 
        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)lp->base_addr, ndev->irq);
+                (unsigned long __force)lp->base_addr, ndev->irq);
        return 0;
 
 error: