declance: Fix 64-bit compilation warnings

This fixes compiler warnings:

drivers/net/ethernet/amd/declance.c: In function 'lance_init_ring':
drivers/net/ethernet/amd/declance.c:478: warning: format '%8.8x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
drivers/net/ethernet/amd/declance.c:487: warning: format '%8.8x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
drivers/net/ethernet/amd/declance.c:503: warning: cast from pointer to integer of different size
drivers/net/ethernet/amd/declance.c:520: warning: cast from pointer to integer of different size

in 64-bit compilation.  Where the value printed is an offset (whose range
will always fit) the cast uses a 32-bit type, otherwise, where it is a
host memory address, the pointer is output directly with %p.  Also the
remaining `0x' prefix is dropped for consistency across these messages.

Tested with both 32-bit and 64-bit compilation, as well as at the run time
(with the debug messages affected enabled).

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index 57397295887c964b23f2bbb7cf7d25d908ab2b29..b584b78237dfdbf9ae50618c2b992459137b2739 100644 (file)
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -475,7 +475,7 @@ static void lance_init_ring(struct net_device *dev)
        *lib_ptr(ib, rx_ptr, lp->type) = leptr;
        if (ZERO)
                printk("RX ptr: %8.8x(%8.8x)\n",
-                      leptr, lib_off(brx_ring, lp->type));
+                      leptr, (uint)lib_off(brx_ring, lp->type));
 
        /* Setup tx descriptor pointer */
        leptr = offsetof(struct lance_init_block, btx_ring);
@@ -484,7 +484,7 @@ static void lance_init_ring(struct net_device *dev)
        *lib_ptr(ib, tx_ptr, lp->type) = leptr;
        if (ZERO)
                printk("TX ptr: %8.8x(%8.8x)\n",
-                      leptr, lib_off(btx_ring, lp->type));
+                      leptr, (uint)lib_off(btx_ring, lp->type));
 
        if (ZERO)
                printk("TX rings:\n");
@@ -499,8 +499,8 @@ static void lance_init_ring(struct net_device *dev)
                                                /* The ones required by tmd2 */
                *lib_ptr(ib, btx_ring[i].misc, lp->type) = 0;
                if (i < 3 && ZERO)
-                       printk("%d: 0x%8.8x(0x%8.8x)\n",
-                              i, leptr, (uint)lp->tx_buf_ptr_cpu[i]);
+                       printk("%d: %8.8x(%p)\n",
+                              i, leptr, lp->tx_buf_ptr_cpu[i]);
        }
 
        /* Setup the Rx ring entries */
@@ -516,8 +516,8 @@ static void lance_init_ring(struct net_device *dev)
                                                             0xf000;
                *lib_ptr(ib, brx_ring[i].mblength, lp->type) = 0;
                if (i < 3 && ZERO)
-                       printk("%d: 0x%8.8x(0x%8.8x)\n",
-                              i, leptr, (uint)lp->rx_buf_ptr_cpu[i]);
+                       printk("%d: %8.8x(%p)\n",
+                              i, leptr, lp->rx_buf_ptr_cpu[i]);
        }
        iob();
 }