From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 586D2C46471 for ; Tue, 7 Aug 2018 11:43:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F34F2178F for ; Tue, 7 Aug 2018 11:43:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="SIKCi+db" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F34F2178F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389043AbeHGN4j (ORCPT ); Tue, 7 Aug 2018 09:56:39 -0400 Received: from outils.crapouillou.net ([89.234.176.41]:54144 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389015AbeHGN4i (ORCPT ); Tue, 7 Aug 2018 09:56:38 -0400 From: Paul Cercueil To: Vinod Koul , Rob Herring , Mark Rutland , Ralf Baechle , Paul Burton , James Hogan , Zubair Lutfullah Kakakhel Cc: Paul Cercueil , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, Daniel Silsby Subject: [PATCH v4 12/18] dmaengine: dma-jz4780: Simplify jz4780_dma_desc_residue() Date: Tue, 7 Aug 2018 13:42:12 +0200 Message-Id: <20180807114218.20091-13-paul@crapouillou.net> In-Reply-To: <20180807114218.20091-1-paul@crapouillou.net> References: <20180807114218.20091-1-paul@crapouillou.net> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1533642160; bh=UaYjkuWn7rqYy6k7gqyn08yAI0x7hmJ/3cPov77Hv4U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=SIKCi+db78ljhPH1GKMm1p+Gjtggpc7EdEiZurO+X5NfoBYb9b/DQP6aWFXXOlCc2EOxG/IfeVas6eDZEfL8QVq0sRhW/WPnxSa+9RBO+UJFUbRNHMR8Idc53svoznYLu0neAhdd1nMfNS/o1wIx1aXkDpnTThKm2fd15laUcUY= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Silsby Simple cleanup, no changes to actual logic here. Signed-off-by: Daniel Silsby Signed-off-by: Paul Cercueil Tested-by: Mathieu Malaterre --- drivers/dma/dma-jz4780.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) v2: No change v3: No change v4: Add my Signed-off-by diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index a4292ac4c686..019cebc2e5e5 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -610,22 +610,17 @@ static size_t jz4780_dma_desc_residue(struct jz4780_dma_chan *jzchan, struct jz4780_dma_desc *desc, unsigned int next_sg) { struct jz4780_dma_dev *jzdma = jz4780_dma_chan_parent(jzchan); - unsigned int residue, count; + unsigned int count = 0; unsigned int i; - residue = 0; - for (i = next_sg; i < desc->count; i++) - residue += (desc->desc[i].dtc & 0xffffff) << - jzchan->transfer_shift; + count += desc->desc[i].dtc & 0xffffff; - if (next_sg != 0) { - count = jz4780_dma_chn_readl(jzdma, jzchan->id, + if (next_sg != 0) + count += jz4780_dma_chn_readl(jzdma, jzchan->id, JZ_DMA_REG_DTC); - residue += count << jzchan->transfer_shift; - } - return residue; + return count << jzchan->transfer_shift; } static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, -- 2.11.0