From patchwork Wed Jul 2 15:28:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 32996 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 020EA20560 for ; Wed, 2 Jul 2014 15:29:32 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rp18sf8899641iec.9 for ; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=oh9/NXaf11GgpMBY2cJXeR/3Oc66v6JV4d1tp6aV2sE=; b=I7a0bU8kJh6kbabCzhGTA6zU132ep57x8iUqsXvvO1ocNt9N9zDNRcHEbCjuwHc6IB uid0wX0YKMMumP7Bx3xBmL7mssSG77/ARZqLmZfFqVLuGlOMZJiLx04GWmbqW+UM5zx7 DsFhxvRrx88vecgJEvj+px5XIc+hipUXJDcdNYGlrl41m9/anRXvAJZItzCn1Mn+IzN9 kyD0VZC+r9mCeXlZv0RbzWC3T9f5Sc19cDS97wrQC77hBKmlp0XtdeZvWG70A8/5IimV mP//iURKXYTsyif4v35TjFuevwCHcdNNk3ox+4gVrg06jQkxDz3NxPMyDdGcIxKhzPou GNAg== X-Gm-Message-State: ALoCoQkbFxbxU+rHqfhWvVzt+rd1tGOytGW9WcXQ1elLyjgtzcQV47btMh+07Hv6NPrc6dz1yKaU X-Received: by 10.182.33.106 with SMTP id q10mr28994826obi.8.1404314972524; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.241 with SMTP id 104ls85076qgv.21.gmail; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr49833156vch.22.1404314972408; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id kz4si7848868vdb.74.2014.07.02.08.29.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 08:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id oy12so11538371veb.9 for ; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) X-Received: by 10.220.44.141 with SMTP id a13mr124193vcf.71.1404314972324; Wed, 02 Jul 2014 08:29:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp301906vcb; Wed, 2 Jul 2014 08:29:31 -0700 (PDT) X-Received: by 10.42.109.79 with SMTP id k15mr4607963icp.15.1404314971470; Wed, 02 Jul 2014 08:29:31 -0700 (PDT) Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id a4si2579340igh.37.2014.07.02.08.29.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 08:29:31 -0700 (PDT) Received-SPF: pass (google.com: domain of lee.jones@linaro.org designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Received: by mail-ig0-f178.google.com with SMTP id hn18so385352igb.17 for ; Wed, 02 Jul 2014 08:29:31 -0700 (PDT) X-Received: by 10.43.160.68 with SMTP id mb4mr4660343icc.4.1404314971245; Wed, 02 Jul 2014 08:29:31 -0700 (PDT) Received: from localhost.localdomain (host109-148-235-194.range109-148.btcentralplus.com. [109.148.235.194]) by mx.google.com with ESMTPSA id d4sm23997781igc.5.2014.07.02.08.29.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 08:29:28 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: sameo@linux.intel.com, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 05/12] mfd: arizona: Rid data size incompatibility warn when building for 64bit Date: Wed, 2 Jul 2014 16:28:37 +0100 Message-Id: <1404314924-23564-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1404314924-23564-1-git-send-email-lee.jones@linaro.org> References: <1404314924-23564-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index b4f22e7..e9c3563 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 beccb79..9d4156f 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 1ca554b..5145d78 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 b4cef77..2951498 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; }