From patchwork Sun Feb 1 11:42:11 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: 5756591 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 BDFB09F269 for ; Sun, 1 Feb 2015 11:46:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E4C0E2015A for ; Sun, 1 Feb 2015 11:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C26620125 for ; Sun, 1 Feb 2015 11:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752605AbbBALq0 (ORCPT ); Sun, 1 Feb 2015 06:46:26 -0500 Received: from www.osadl.org ([62.245.132.105]:40377 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752722AbbBALq0 (ORCPT ); Sun, 1 Feb 2015 06:46:26 -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 t11BkBot028079; Sun, 1 Feb 2015 12:46:12 +0100 From: Nicholas Mc Guire To: Nicolas Ferre Cc: Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] spi: atmel: cleanup wait_for_completion return handling Date: Sun, 1 Feb 2015 06:42:11 -0500 Message-Id: <1422790931-4794-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. Further it removes the else branch as the only thing it was doing is assigning ret to 0 - but ret is never used thereafter so that is not needed. As the string in dev_err already states "timeout" there is little point in printing the 0 here. directly rather than adding a additional appropriately typed variable. Signed-off-by: Nicholas Mc Guire --- This patch was only compile tested with at91_dt_defconfig (implies CONFIG_SPI_ATMEL=y) Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi-atmel.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 23d8f5f5..fd6744c 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1046,6 +1046,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, struct atmel_spi_device *asd; int timeout; int ret; + unsigned long dma_timeout; as = spi_master_get_devdata(master); @@ -1103,16 +1104,14 @@ static int atmel_spi_one_transfer(struct spi_master *master, /* interrupts are disabled, so free the lock for schedule */ atmel_spi_unlock(as); - ret = wait_for_completion_timeout(&as->xfer_completion, + dma_timeout = wait_for_completion_timeout(&as->xfer_completion, SPI_DMA_TIMEOUT); atmel_spi_lock(as); - if (WARN_ON(ret == 0)) { + if (WARN_ON(dma_timeout == 0)) { dev_err(&spi->dev, - "spi trasfer timeout, err %d\n", ret); + "spi trasfer timeout\n"); as->done_status = -EIO; - } else { - ret = 0; - } + } if (as->done_status) break;