[PATCH 3.16 245/294] mlx5: avoid build warnings on 32-bit

[Ben Hutchings]

3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Arnd Bergmann 

commit 065bd8c28ba37d04c9a5b732173c1508954b1f58 upstream.

The mlx5 driver passes a string pointer in through a 'u64' variable,
which on 32-bit machines causes a build warning:

drivers/net/ethernet/mellanox/mlx5/core/debugfs.c: In function 'qp_read_field':
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c:303:11: warning: cast from 
pointer to integer of different size [-Wpointer-to-int-cast]

The code is in fact safe, so we can shut up the warning by adding
extra type casts.

Signed-off-by: Arnd Bergmann 
Signed-off-by: David S. Miller 
Signed-off-by: Ben Hutchings 
---
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -300,11 +300,11 @@ static u64 qp_read_field(struct mlx5_cor
param = qp->pid;
break;
case QP_STATE:
-   param = (u64)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28);
+   param = (unsigned 
long)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28);
*is_str = 1;
break;
case QP_XPORT:
-   param = (u64)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 
0xff);
+   param = (unsigned 
long)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 0xff);
*is_str = 1;
break;
case QP_MTU:
@@ -464,7 +464,7 @@ static ssize_t dbg_read(struct file *fil
 
 
if (is_str)
-   ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char *)field);
+   ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char 
*)(unsigned long)field);
else
ret = snprintf(tbuf, sizeof(tbuf), "0x%llx\n", field);
 

[PATCH 3.16 245/294] mlx5: avoid build warnings on 32-bit

[Ben Hutchings]

3.16.50-rc1 review patch.  If anyone has any objections, please let me know.

--

From: Arnd Bergmann 

commit 065bd8c28ba37d04c9a5b732173c1508954b1f58 upstream.

The mlx5 driver passes a string pointer in through a 'u64' variable,
which on 32-bit machines causes a build warning:

drivers/net/ethernet/mellanox/mlx5/core/debugfs.c: In function 'qp_read_field':
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c:303:11: warning: cast from 
pointer to integer of different size [-Wpointer-to-int-cast]

The code is in fact safe, so we can shut up the warning by adding
extra type casts.

Signed-off-by: Arnd Bergmann 
Signed-off-by: David S. Miller 
Signed-off-by: Ben Hutchings 
---
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -300,11 +300,11 @@ static u64 qp_read_field(struct mlx5_cor
param = qp->pid;
break;
case QP_STATE:
-   param = (u64)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28);
+   param = (unsigned 
long)mlx5_qp_state_str(be32_to_cpu(ctx->flags) >> 28);
*is_str = 1;
break;
case QP_XPORT:
-   param = (u64)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 
0xff);
+   param = (unsigned 
long)mlx5_qp_type_str((be32_to_cpu(ctx->flags) >> 16) & 0xff);
*is_str = 1;
break;
case QP_MTU:
@@ -464,7 +464,7 @@ static ssize_t dbg_read(struct file *fil
 
 
if (is_str)
-   ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char *)field);
+   ret = snprintf(tbuf, sizeof(tbuf), "%s\n", (const char 
*)(unsigned long)field);
else
ret = snprintf(tbuf, sizeof(tbuf), "0x%llx\n", field);