From patchwork Sun Feb 8 08:33:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 437673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 466F5140172 for ; Sun, 8 Feb 2015 19:37:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367AbbBHIhc (ORCPT ); Sun, 8 Feb 2015 03:37:32 -0500 Received: from www.osadl.org ([62.245.132.105]:45107 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbbBHIhb (ORCPT ); Sun, 8 Feb 2015 03:37:31 -0500 Received: from debian.hofrr.at (92-243-35-153.adsl.nanet.at [92.243.35.153] (may be forged)) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id t188bKf8024158; Sun, 8 Feb 2015 09:37:21 +0100 From: Nicholas Mc Guire To: Wolfram Sang Cc: Anders Berg , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] i2c: axxia: match var to return type of wait_for_completion_timeout Date: Sun, 8 Feb 2015 03:33:22 -0500 Message-Id: <1423384402-11572-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KHOP_SC_TOP_CIDR8, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on www.osadl.org Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org return type of wait_for_completion_timeout is unsigned long not int. as ret is only used for wait_for_completion_timeout here the type is simply changed unsigned long. Signed-off-by: Nicholas Mc Guire --- Patch was only compile tested with axm55xx_defconfig (implies CONFIG_I2C_AXXIA=y) Patch is against 3.19.0-rc7 (localversion-next is -next-20150204) drivers/i2c/busses/i2c-axxia.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c index 768a598..1decc88 100644 --- a/drivers/i2c/busses/i2c-axxia.c +++ b/drivers/i2c/busses/i2c-axxia.c @@ -334,7 +334,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg) u32 int_mask = MST_STATUS_ERR | MST_STATUS_SNS; u32 rx_xfer, tx_xfer; u32 addr_1, addr_2; - int ret; + unsigned long ret; if (msg->len > 255) { dev_warn(idev->dev, "unsupported length %u\n", msg->len);