From patchwork Thu Jan 23 15:05:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 23627 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 994A6203BE for ; Thu, 23 Jan 2014 15:08:38 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id x10sf4269360pdj.0 for ; Thu, 23 Jan 2014 07:08:37 -0800 (PST) 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=Dwsu335SQCde+ENUIyQVGYHKSAsakgpy7N0dfcTn98M=; b=AkFmX+bCW6FiOHOARpWlwQeKmRCcIKdwImHwp+0eku33S24dEE+G3OrosDx0AWsXLj NKdhmjE/uSfOB+Qa4SXO9+3WaABctdRN2UnQI+ST04xHIWqUNMkZ8Pm2OROitWMHZZTo fXvcTkKzaQtEHSY+l4bstCQEkSoEnvZmLzL+zhbRGCc/oRkYn4COGU4jXptcsIFspLos NISPdRxeKbudTA+F4q87MWKGwalJZb9hwr2xxEYPXLbeQiCWNhDdvS4engRgHAjLG98/ yKal6XkgMvISY3XAFFmHzSYRxTc1Pr8hXPXJexjtK9F5A0kwyuiRmyGuCkUi61YWm8/g doRQ== X-Gm-Message-State: ALoCoQl6CYqSZiLKeC5Kw+Y9tpcpfZsew8VlKvEqZ+hOn0JjD2weqQKQc5cO3r7XR1fSLH/XOw8f X-Received: by 10.66.141.231 with SMTP id rr7mr3082109pab.47.1390489717883; Thu, 23 Jan 2014 07:08:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.105 with SMTP id g9ls315847qej.34.gmail; Thu, 23 Jan 2014 07:08:37 -0800 (PST) X-Received: by 10.220.5.133 with SMTP id 5mr18621vcv.73.1390489717732; Thu, 23 Jan 2014 07:08:37 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id qw5si6813633vcb.48.2014.01.23.07.08.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 07:08:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id 11so1101694vbe.24 for ; Thu, 23 Jan 2014 07:08:37 -0800 (PST) X-Received: by 10.220.98.204 with SMTP id r12mr176355vcn.48.1390489717653; Thu, 23 Jan 2014 07:08:37 -0800 (PST) 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.220.174.196 with SMTP id u4csp32974vcz; Thu, 23 Jan 2014 07:08:37 -0800 (PST) X-Received: by 10.194.92.7 with SMTP id ci7mr2677817wjb.58.1390489716675; Thu, 23 Jan 2014 07:08:36 -0800 (PST) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by mx.google.com with ESMTPS id r2si9325546wic.62.2014.01.23.07.08.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 07:08:36 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.43 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.43; Received: by mail-wg0-f43.google.com with SMTP id y10so1633370wgg.10 for ; Thu, 23 Jan 2014 07:08:36 -0800 (PST) X-Received: by 10.180.91.164 with SMTP id cf4mr24718824wib.2.1390489716214; Thu, 23 Jan 2014 07:08:36 -0800 (PST) Received: from localhost.localdomain ([80.76.198.141]) by mx.google.com with ESMTPSA id co15sm23021599wjb.12.2014.01.23.07.08.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 07:08:35 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, sameo@linux.intel.com, Lee Jones Subject: [PATCH 2/4] mfd: max8998: Naturalise cross-architecture discrepancies Date: Thu, 23 Jan 2014 15:05:54 +0000 Message-Id: <1390489556-9434-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1390489556-9434-1-git-send-email-lee.jones@linaro.org> References: <1390489556-9434-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=neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , If we compile the MAX8998 for a 64bit architecture we receive the following warnings: drivers/mfd/max8998.c: In function ‘max8998_i2c_get_driver_data’: drivers/mfd/max8998.c:178:10: warning: cast from pointer to integer of different size return (int)match->data; ^ Signed-off-by: Lee Jones --- drivers/mfd/max8998.c | 6 +++--- include/linux/mfd/max8998-private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index f47eaa7..5d5e186 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -169,16 +169,16 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata( return pd; } -static inline int max8998_i2c_get_driver_data(struct i2c_client *i2c, +static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c, const struct i2c_device_id *id) { if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) { const struct of_device_id *match; match = of_match_node(max8998_dt_match, i2c->dev.of_node); - return (int)match->data; + return (unsigned long)match->data; } - return (int)id->driver_data; + return id->driver_data; } static int max8998_i2c_probe(struct i2c_client *i2c, diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h index 4ecb24b..d68ada5 100644 --- a/include/linux/mfd/max8998-private.h +++ b/include/linux/mfd/max8998-private.h @@ -163,7 +163,7 @@ struct max8998_dev { int ono; u8 irq_masks_cur[MAX8998_NUM_IRQ_REGS]; u8 irq_masks_cache[MAX8998_NUM_IRQ_REGS]; - int type; + unsigned long type; bool wakeup; };