From patchwork Mon Feb 2 09:11:49 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: 5760161 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0B9DABF440 for ; Mon, 2 Feb 2015 09:16:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16809201F5 for ; Mon, 2 Feb 2015 09:16:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 270D72015E for ; Mon, 2 Feb 2015 09:16:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932651AbbBBJQK (ORCPT ); Mon, 2 Feb 2015 04:16:10 -0500 Received: from www.osadl.org ([62.245.132.105]:46577 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbbBBJQJ (ORCPT ); Mon, 2 Feb 2015 04:16:09 -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 t129Fu4A030837; Mon, 2 Feb 2015 10:15:56 +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 v2] spi: tegra114: cleanup wait_for_completion return handling Date: Mon, 2 Feb 2015 04:11:49 -0500 Message-Id: <1422868311-10929-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 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 explicitly states "timeout" there is little point in printing the 0 here which also just says "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_TEGRA114=y) Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi-tegra114.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 73779ce..0dfb422 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c @@ -807,6 +807,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, struct spi_transfer *xfer; struct spi_device *spi = msg->spi; int ret; + unsigned long dma_timeout; bool skip = false; msg->status = 0; @@ -833,11 +834,10 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, } is_first_msg = false; - ret = wait_for_completion_timeout(&tspi->xfer_completion, - SPI_DMA_TIMEOUT); - if (WARN_ON(ret == 0)) { - dev_err(tspi->dev, - "spi trasfer timeout, err %d\n", ret); + dma_timeout = wait_for_completion_timeout( + &tspi->xfer_completion, SPI_DMA_TIMEOUT); + if (WARN_ON(dma_timeout == 0)) { + dev_err(tspi->dev, "spi transfer timeout\n"); ret = -EIO; goto complete_xfer; }