From patchwork Fri May 5 19:46:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98664 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292682qge; Fri, 5 May 2017 12:48:19 -0700 (PDT) X-Received: by 10.84.233.131 with SMTP id l3mr30375619plk.18.1494013698986; Fri, 05 May 2017 12:48:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.18; Fri, 05 May 2017 12:48:18 -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 S1751284AbdEETsR (ORCPT + 6 others); Fri, 5 May 2017 15:48:17 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:58310 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752999AbdEETsN (ORCPT ); Fri, 5 May 2017 15:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ls3eJ-1e3gCy0qfn-013vAw; Fri, 05 May 2017 21:48:11 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Arnd Bergmann Subject: [PATCH 3.16-stable 20/87] ASoC: imx-audmux: Use uintptr_t for port numbers Date: Fri, 5 May 2017 21:46:38 +0200 Message-Id: <20170505194745.3627137-21-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:cagsY8++YIEh25+5BIcOP9A3JOfBYuKHQZYFcmAurTAjNdukPr/ +eEXjs9qSM5n1nziKctKwtS8FFuHi7mtaaFAQCZ5ZccV/6pzsNXPB5FBCzxmdzznPz/mNLP hBECLt5nl+P1dGaxAWj4InoMmM4zMy2aMI3cZPi9cQi4TwI7PMkSQGI6TrcKs9NN6I+Ek0Y tzSjkEYYSHHlJgzq/T5Og== X-UI-Out-Filterresults: notjunk:1; V01:K0:6iBl/XsEO0Y=:wY48mmW861YEVj7idhEOE7 Kfjog5Ov0B6mcNnAgXS+Gu2FWX+e7JKK8j8Ny5Htet4EeUKvU52s8b+KelRR08gjldQ/iOgFj +mbp5nj77LfIE3arx5fNQOgwYWxodgTD91NIO6JA5IcboCzHHT314UaZvJAJJim5bXqIrAiTy AD/5zvIrZEVnWzOmsU+7W7ndFtznc9UnABKCVLPMabBdAa0JdmsK06tzpdvkxx5+gdjxKDkp0 OsQEWCcYxObDV3bs3ORHeuxHy+DWGaJ7FVncCmrW+Vx3NKQIWXkWxXsRJdtk+5t0ciZjTDS7C fpjN8G7+rfxlC+sZODfPgyAnh1GcvyCTnDoINSt4JpqTvgsGyai15IrJ4/gOG37QxzQYExFkK IWl5XfQUmoHZykw/wsenTDYFiEg6qer02wD3aDvenE1x80y7+E5ALf+QQx8mFq9VNeSYBnAKP tP+5guw6xNU0DjVz13sxnRqN0Em0E34yMn2DVJjcIrHee+GnvMxh+0ZdhACyIZhAZq5OiUtwJ 9jApnOO6lL2Z/GljlT/twBdqkwbaLgDPDPg1FMz6f3OjD9e9w44FnKB3n7jgrEE9yjxbinC9a OeokxkOIanCzq4bUKxLV0pUxWp0DDFSM8A+XSzRpyMxbAbmLh595r/4c+52iLuayRTT3FCFHl /3MWPduXuzHXYaF85VqmZYOKJujRHtcS+D7dzzjQiV6ejuP3tCmHvjz2J+Znt9Mot0YM= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown Commit 30e75719940ef0a873778f69e2d129ab516ae31d upstream. Since we pass the port number through file private data for debugfs we cast it to and from a pointer so use uintptr_t in order to ensure that the types are compatible, avoiding warnings on 64 bit platforms where pointers are 64 bit and unsigned integers 32 bit. Signed-off-by: Mark Brown Signed-off-by: Arnd Bergmann --- sound/soc/fsl/imx-audmux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 267717aa96c1..46f9beb6b273 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -67,7 +67,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, { ssize_t ret; char *buf; - int port = (int)file->private_data; + uintptr_t port = (uintptr_t)file->private_data; u32 pdcr, ptcr; if (audmux_clk) { @@ -147,7 +147,7 @@ static const struct file_operations audmux_debugfs_fops = { static void audmux_debugfs_init(void) { - int i; + uintptr_t i; char buf[20]; audmux_debugfs_root = debugfs_create_dir("audmux", NULL); @@ -157,10 +157,10 @@ static void audmux_debugfs_init(void) } for (i = 0; i < MX31_AUDMUX_PORT7_SSI_PINS_7 + 1; i++) { - snprintf(buf, sizeof(buf), "ssi%d", i); + snprintf(buf, sizeof(buf), "ssi%lu", i); if (!debugfs_create_file(buf, 0444, audmux_debugfs_root, (void *)i, &audmux_debugfs_fops)) - pr_warning("Failed to create AUDMUX port %d debugfs file\n", + pr_warning("Failed to create AUDMUX port %lu debugfs file\n", i); } }