From patchwork Mon Feb 2 09:11:50 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: 435400 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 8A39E140190 for ; Mon, 2 Feb 2015 20:17:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932980AbbBBJQW (ORCPT ); Mon, 2 Feb 2015 04:16:22 -0500 Received: from www.osadl.org ([62.245.132.105]:46589 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932976AbbBBJQT (ORCPT ); Mon, 2 Feb 2015 04:16:19 -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 t129Fu4B030837; Mon, 2 Feb 2015 10:16:05 +0100 From: Nicholas Mc Guire To: Laxman Dewangan Cc: Mark Brown , Stephen Warren , Thierry Reding , Alexandre Courbot , linux-spi@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH 1/2 v2] spi: tegra20-sflash: cleanup wait_for_completion return handling Date: Mon, 2 Feb 2015 04:11:50 -0500 Message-Id: <1422868311-10929-2-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422868311-10929-1-git-send-email-hofrat@osadl.org> References: <1422868311-10929-1-git-send-email-hofrat@osadl.org> X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_96_Q, KHOP_SC_TOP_CIDR8,RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on www.osadl.org Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org return type of wait_for_completion_timeout is unsigned long not int, this patch adds an appropriate variable and fixes up the assignment. As the string in dev_err already states "timeout" there is little point in printing the 0 here. Signed-off-by: Nicholas Mc Guire --- v2: typo fixed as suggested by Laxman Dewangan This patch was only compile tested with tegra_defconfig (implies CONFIG_SPI_TEGRA20_SFLASH=y) Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi-tegra20-sflash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index b6558bb..48a7c74 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -323,6 +323,7 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master, struct spi_transfer *xfer; struct spi_device *spi = msg->spi; int ret; + unsigned long dma_timeout; msg->status = 0; msg->actual_length = 0; @@ -337,11 +338,11 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master, goto exit; } is_first_msg = false; - ret = wait_for_completion_timeout(&tsd->xfer_completion, + dma_timeout = wait_for_completion_timeout(&tsd->xfer_completion, SPI_DMA_TIMEOUT); - if (WARN_ON(ret == 0)) { + if (WARN_ON(dma_timeout == 0)) { dev_err(tsd->dev, - "spi trasfer timeout, err %d\n", ret); + "spi transfer timeout\n"); ret = -EIO; goto exit; }