From patchwork Fri May 5 19:47:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98735 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293674qge; Fri, 5 May 2017 12:50:45 -0700 (PDT) X-Received: by 10.99.152.18 with SMTP id q18mr5258610pgd.54.1494013728315; Fri, 05 May 2017 12:48:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.47; Fri, 05 May 2017 12:48:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060AbdEETsq (ORCPT + 6 others); Fri, 5 May 2017 15:48:46 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52225 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755672AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LisgQ-1dd2cq2PgE-00dHWN; Fri, 05 May 2017 21:48:22 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" Subject: [PATCH 3.16-stable 46/87] mlx5: avoid build warnings on 32-bit Date: Fri, 5 May 2017 21:47:04 +0200 Message-Id: <20170505194745.3627137-47-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:wiNSzntpChTkXRUvHqOIVv+kFVuugibfsN4iWj9TA+XmmdYOYyN PjBanb0IHZ9vEQ7eGzgTY46T6oyRccBvC47Ech5VIn1W8BUqyhbOoqvkuK016bKsrQ8Id++ lBqIwnQyoSE0Ie4C+HpeCm8JiaVqxRHjsdQRYTmVHgXx5YGK6wCW2ej9i5UONJSclo+SW6U bS10O+lM03+h9bElEVjiw== X-UI-Out-Filterresults: notjunk:1; V01:K0:S2X170p9Tyg=:ZYwo9uAhmU4Bhyhu/ptfY5 vjcReqF2hfbm6Up0X41JctYNS+WStlap/khvwup2oFcJOUjDTivyHjlyuDqmvWNLava+UgttW QkGOBFh1hAorVw7E8+pUjhAWYpgCY2YjKlbczbJ9k7F930GrtP961RdEB2u+p3S1FnbVpfjSS Gq3IN2Vkt2yUiErsNbPzlCkCfSb3pz2aZQYpJct/Zjfvi5SKz82wBjE5nmpK8T9H9yz35U/jE Bh2entCg6Q4ABIhu/RHVtBfkJIq5Z4K2zu3l67KJJh7uZUHXAH0DbRQp4nHAXg30vB786LU87 sGIrRVPPPpvaRLuSIcqGPk+iy+ElpW4eo23nE2is9oRpgZ7x117nQAg1uG18RkOk9NiB7bdtZ dTr2i61vQ7D7jrsc49T5SK1YURaR1apbiHF+JOnmVI84vtj/rZvvMk4qgoWt9NRQusehUenRX V8iGAnAXixuo7rlE3aA+K03eD9pXbbFqk1uSO2jTqpSR1ksE+xLjBa1Gb9qynr4av7H+JrmHY Xi0UCZiWctSC7lkacq87W7NzINTWbz0VkgN7DyxzPHk1LafDsjgx03/6/GIm+pLQSHDeH5K0M AnjJldeRbUzU1mE8AWUntbZfbvuTijKv+aoufWBtofKkWY8QH9dyX0xrX9Rz7Cp+c4tQ3HQPk Q/Too2LwwRYMISDZK4M0Vneh5ppTxN2r+OexTkz6vgCAloUNfC5F/BDu/YfnGv3JS4SM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit 07fd45564be5acb2667ab76d8c075886377928a5 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: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c index 10e1f1a18255..4878025e231c 100644 --- 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_core_dev *dev, struct mlx5_core_qp *qp, 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 *filp, char __user *buf, size_t count, 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);