From patchwork Mon Feb 2 09:11:51 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: 5760191 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CCFA19F39B for ; Mon, 2 Feb 2015 09:16:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEF312015E for ; Mon, 2 Feb 2015 09:16:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D378201F5 for ; Mon, 2 Feb 2015 09:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933079AbbBBJQ0 (ORCPT ); Mon, 2 Feb 2015 04:16:26 -0500 Received: from www.osadl.org ([62.245.132.105]:46594 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933064AbbBBJQY (ORCPT ); Mon, 2 Feb 2015 04:16:24 -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 t129Fu4C030837; Mon, 2 Feb 2015 10:16:12 +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 2/2 v2] spi: tegra20-slink: cleanup wait_for_completion return handling Date: Mon, 2 Feb 2015 04:11:51 -0500 Message-Id: <1422868311-10929-3-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 as it just restates "timeout". 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_SLINK=y) Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi-tegra20-slink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 85c91f5..106afe1 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -811,6 +811,7 @@ static int tegra_slink_transfer_one(struct spi_master *master, { struct tegra_slink_data *tspi = spi_master_get_devdata(master); int ret; + unsigned long dma_timeout; reinit_completion(&tspi->xfer_completion); ret = tegra_slink_start_transfer_one(spi, xfer); @@ -820,11 +821,10 @@ static int tegra_slink_transfer_one(struct spi_master *master, return ret; } - ret = wait_for_completion_timeout(&tspi->xfer_completion, + dma_timeout = wait_for_completion_timeout(&tspi->xfer_completion, SLINK_DMA_TIMEOUT); - if (WARN_ON(ret == 0)) { - dev_err(tspi->dev, - "spi trasfer timeout, err %d\n", ret); + if (WARN_ON(dma_timeout == 0)) { + dev_err(tspi->dev, "spi transfer timeout\n"); return -EIO; }