Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933083AbbBBJQY (ORCPT ); Mon, 2 Feb 2015 04:16:24 -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 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1784 Lines: 53 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; } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/