From patchwork Wed Apr 18 11:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10347963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A9CD96053F for ; Wed, 18 Apr 2018 11:41:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DCFD28604 for ; Wed, 18 Apr 2018 11:41:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86D782860B; Wed, 18 Apr 2018 11:41:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F3856285F3 for ; Wed, 18 Apr 2018 11:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=5S9piehgDKeQYp9weqGCubPLoQDy8gNKralDKRUc7D4=; b=Zjq BJm+jzNm4v9r9QJ/mDfg1Z4fOE4DEIr6eLT1W6tb2XqpvzGHBhsNNAbPYNceGIevFVsPOK4+JKdzu 0Sjl0eSPvWowb2Rhnla5e0wXb86mDHHN0+l4ZfvxiI42Y0sY+U9Lg39wQtF6RIt78Tws0xqSMHGoF BHeOaTDuVXsJfnO9RfIqlM2ZBcYSJaiTMxMSOutLyRbP5RD7n+oxCUeyuQdws1EfDoGXtB3sbTlYo bcn69NRMejW6YgLhk9rZCbFYwwxTClnqZ9zeIqSrRak9I00i1jOGPbXNan8TbFlkg+ATDh/rCCBEI z/lWnLtiAU3GaGwQjtpoXWlHqJvojYA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8lSO-0004lz-1E; Wed, 18 Apr 2018 11:41:00 +0000 Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8lSI-0004jY-PH for linux-arm-kernel@lists.infradead.org; Wed, 18 Apr 2018 11:40:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=ScvS0QVhoHazhJQXhvQlks11d9u1x5v1U1sCeEEe3GE=; b=eyB5YJDGlyDO NFrZ/0Wx9dsGXqwLuK+aAmQ9swOm2YWzfvbH1PKFVtCs0cIdUbIUqzDoz6aR2DcTElWrUG5YO1hUR AIvVGFOi7cclK8QSbKTQll7TckAzTqj2UKHXvpDWjBcGbjwSyS2VejL0Ar8KAiazZJLlNiGdU9d0i fq2pA=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f8lS6-0000YB-Uj; Wed, 18 Apr 2018 11:40:43 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8lS6-00024O-GC; Wed, 18 Apr 2018 12:40:42 +0100 From: Mark Brown To: Sylwester Nawrocki Subject: Applied "spi: spi-s3c64xx: Use local variable for FIFO length" to the spi tree In-Reply-To: <20180417142954.5507-7-s.nawrocki@samsung.com> Message-Id: Date: Wed, 18 Apr 2018 12:40:42 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180418_044055_020567_A52EDC54 X-CRM114-Status: GOOD ( 15.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, b.zolnierkie@samsung.com, broonie@kernel.org, krzk@kernel.org, linux-spi@vger.kernel.org, kgene@kernel.org, andi@etezian.org, linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: spi-s3c64xx: Use local variable for FIFO length has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From f6364e66c66135f40709635849620411f3f8a2ff Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 17 Apr 2018 16:29:53 +0200 Subject: [PATCH] spi: spi-s3c64xx: Use local variable for FIFO length More references to fifo_len are added in subsequent patch. Signed-off-by: Sylwester Nawrocki Reviewed-by: Andi Shyti Signed-off-by: Mark Brown --- drivers/spi/spi-s3c64xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index db33bc9b4147..27cd8c59eabf 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -634,6 +634,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, struct spi_transfer *xfer) { struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master); + const unsigned int fifo_len = (FIFO_LVL_MASK(sdd) >> 1) + 1; int status; u32 speed; u8 bpw; @@ -655,9 +656,8 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, /* Polling method for xfers not bigger than FIFO capacity */ use_dma = 0; - if (!is_polling(sdd) && - (sdd->rx_dma.ch && sdd->tx_dma.ch && - (xfer->len > ((FIFO_LVL_MASK(sdd) >> 1) + 1)))) + if (!is_polling(sdd) && (xfer->len > fifo_len) && + sdd->rx_dma.ch && sdd->tx_dma.ch) use_dma = 1; spin_lock_irqsave(&sdd->lock, flags);