]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/mlx5e: use %pad format string for dma_addr_t
authorArnd Bergmann <arnd@arndb.de>
Thu, 8 Dec 2016 21:57:03 +0000 (22:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Dec 2016 02:30:54 +0000 (21:30 -0500)
On 32-bit ARM with 64-bit dma_addr_t I get this warning about an
incorrect format string:

In file included from /git/arm-soc/drivers/net/ethernet/mellanox/mlx5/core/alloc.c:42:0:
drivers/net/ethernet/mellanox/mlx5/core/alloc.c: In function ‘mlx5_frag_buf_alloc_node’:
drivers/net/ethernet/mellanox/mlx5/core/alloc.c:134:12: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]

We have the special %pad format for printing dma_addr_t, so use that
to print the correct address and avoid the warning.

Fixes: 1c1b522808a1 ("net/mlx5e: Implement Fragmented Work Queue (WQ)")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/alloc.c

index 44791de5afe6e191df22b1fb4940d82dcd5f0a58..66bd213f35ce875062478421875620cb5501d4bc 100644 (file)
@@ -130,8 +130,8 @@ int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,
                if (frag->map & ((1 << buf->page_shift) - 1)) {
                        dma_free_coherent(&dev->pdev->dev, frag_sz,
                                          buf->frags[i].buf, buf->frags[i].map);
-                       mlx5_core_warn(dev, "unexpected map alignment: 0x%p, page_shift=%d\n",
-                                      (void *)frag->map, buf->page_shift);
+                       mlx5_core_warn(dev, "unexpected map alignment: %pad, page_shift=%d\n",
+                                      &frag->map, buf->page_shift);
                        goto err_free_buf;
                }
                size -= frag_sz;