From patchwork Fri May 5 19:46:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98660 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292666qge; Fri, 5 May 2017 12:48:16 -0700 (PDT) X-Received: by 10.84.233.200 with SMTP id m8mr41973691pln.118.1494013696158; Fri, 05 May 2017 12:48:16 -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.15; Fri, 05 May 2017 12:48:16 -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 S1755435AbdEETsO (ORCPT + 6 others); Fri, 5 May 2017 15:48:14 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:64551 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324AbdEETsL (ORCPT ); Fri, 5 May 2017 15:48:11 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lup4D-1e6QZ60QEL-01045s; Fri, 05 May 2017 21:48:09 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Lee Jones , Arnd Bergmann Subject: [PATCH 3.16-stable 15/87] mfd: arizona: Rid data size incompatibility warn when building for 64bit Date: Fri, 5 May 2017 21:46:33 +0200 Message-Id: <20170505194745.3627137-16-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> MIME-Version: 1.0 X-Provags-ID: V03:K0:iN5oPKGpUkjbWNbDS0eKeaE6wlwieOvt5ACPmVbqm8eHUTxbIb7 skbQrasca68c9zAhetoaKMeXrKVk5gXoP2v+AkU09mE4uoTHQPdlljeX4zGZYVZbX6GP4R3 3/IYSqAZkaeDjeo1SQppyx6kxaUnVaJo9PSiFitnSjsYp+A1f2LuWKJk5ZGZexNJ8l7yPs8 Yl//8hMEEki2HJJicmOdw== X-UI-Out-Filterresults: notjunk:1; V01:K0:FlxKI5ySQBA=:7+UHUiguxN3n2WnUwTnCAM F6RCpSsESggZuoW9XO1V/UoFEYuerwQ/inHo9fAK3OasUZbL3UC92p4j1ZkI6LfjkU8VRJ9mg tWeB9LncZX7fahPMbSzjwNtvObBUDa8CtwDj5aKy5YimVrQcc0Wa0eT9j9IXuUrWC7b4Q2FcC Iog0WevLwy6rC7pvRw/qzURStswgN8LlQQZx2lr0Rn3bp2wpmYjSzV5ymSf8wl50jmel+qPpP Pp+Oc6TD9zenUikXcHR8BR6rPNbdfhKqFSV1Fu8KUaF/YSndtl4OIinRtYc4f5BxFtGbVlzwh h/97AoWaCB4nN5B7cBnVOAWSlUIYkOtWn8+NAAtJec2S8P5FvaGvHmrSLFgfa124Xx6uF61tJ ymI5gmGr/AqxvAoohUTsXyrHgWGBqBg9X6FZmzHu9u5Ei0ZYwFKBfGpUNxOUbvxAOcZ+PQ9e8 cAliRt4keMesJeN+ewA04IV5zX1/z0GAZrt9LaUrSs6EE7NRgmMzU8CLxmRkfg4AQozMkVjEy Alkj0plwjASKq4rk3admary6aGpZfAMJZiJNVhxg6dI6EuaXX529lfPwbxLKyIiPiB47wYQ9U hU8zl7Bgv07TMeZjyQ/ughYhCTln2OZVvqC/V5ZHuIjAPMU8MWvj/UngmHR3VGc5qxZ/TI4oW pZg/4z9dpqnv02Jjm72gymngLFDogfP4qYx07zR4JRXK+JtsSxzMJDMyqriogqrdu2x8bN2dB C41xhDcwNvjBrwLs Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lee Jones Commit 06128eb07567dabd85aa8249fd60c9d2a060b057 upstream. Extinguishes: ../drivers/mfd/arizona-core.c: In function ‘arizona_of_get_type’: ../drivers/mfd/arizona-core.c:505:10: warning: cast from pointer to integer of different size Signed-off-by: Lee Jones Signed-off-by: Arnd Bergmann --- drivers/mfd/arizona-core.c | 4 ++-- drivers/mfd/arizona-i2c.c | 5 +++-- drivers/mfd/arizona-spi.c | 3 ++- drivers/mfd/arizona.h | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) -- 2.9.0 diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 1577e6418306..c39d119b4cbd 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -497,12 +497,12 @@ const struct dev_pm_ops arizona_pm_ops = { EXPORT_SYMBOL_GPL(arizona_pm_ops); #ifdef CONFIG_OF -int arizona_of_get_type(struct device *dev) +unsigned long arizona_of_get_type(struct device *dev) { const struct of_device_id *id = of_match_device(arizona_of_match, dev); if (id) - return (int)id->data; + return (unsigned long)id->data; else return 0; } diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index beccb790c9ba..9d4156fb082a 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -24,11 +24,12 @@ #include "arizona.h" static int arizona_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) + const struct i2c_device_id *id) { struct arizona *arizona; const struct regmap_config *regmap_config; - int ret, type; + unsigned long type; + int ret; if (i2c->dev.of_node) type = arizona_of_get_type(&i2c->dev); diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c index 1ca554b18bef..5145d78bf07e 100644 --- a/drivers/mfd/arizona-spi.c +++ b/drivers/mfd/arizona-spi.c @@ -28,7 +28,8 @@ static int arizona_spi_probe(struct spi_device *spi) const struct spi_device_id *id = spi_get_device_id(spi); struct arizona *arizona; const struct regmap_config *regmap_config; - int ret, type; + unsigned long type; + int ret; if (spi->dev.of_node) type = arizona_of_get_type(&spi->dev); diff --git a/drivers/mfd/arizona.h b/drivers/mfd/arizona.h index b4cef777df73..2951498ab9a1 100644 --- a/drivers/mfd/arizona.h +++ b/drivers/mfd/arizona.h @@ -46,9 +46,9 @@ int arizona_irq_init(struct arizona *arizona); int arizona_irq_exit(struct arizona *arizona); #ifdef CONFIG_OF -int arizona_of_get_type(struct device *dev); +unsigned long arizona_of_get_type(struct device *dev); #else -static inline int arizona_of_get_type(struct device *dev) +static inline unsigned long arizona_of_get_type(struct device *dev) { return 0; }