From patchwork Mon Aug 29 11:33:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Per Forlin X-Patchwork-Id: 3762 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 96A9023F41 for ; Mon, 29 Aug 2011 11:34:13 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 8AD55A183FA for ; Mon, 29 Aug 2011 11:34:13 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 18so6401918fxd.11 for ; Mon, 29 Aug 2011 04:34:13 -0700 (PDT) Received: by 10.223.24.21 with SMTP id t21mr6934822fab.24.1314617653461; Mon, 29 Aug 2011 04:34:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs93061lab; Mon, 29 Aug 2011 04:34:13 -0700 (PDT) Received: by 10.204.150.193 with SMTP id z1mr2128835bkv.123.1314617653052; Mon, 29 Aug 2011 04:34:13 -0700 (PDT) Received: from mail-bw0-f50.google.com (mail-bw0-f50.google.com [209.85.214.50]) by mx.google.com with ESMTPS id l2si2665761bke.162.2011.08.29.04.34.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 04:34:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of per.forlin@linaro.org) client-ip=209.85.214.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.50 is neither permitted nor denied by best guess record for domain of per.forlin@linaro.org) smtp.mail=per.forlin@linaro.org Received: by mail-bw0-f50.google.com with SMTP id zu5so5471497bkb.37 for ; Mon, 29 Aug 2011 04:34:11 -0700 (PDT) Received: by 10.204.139.197 with SMTP id f5mr1991945bku.100.1314617651839; Mon, 29 Aug 2011 04:34:11 -0700 (PDT) Received: from localhost.localdomain (c-c37f71d5.029-82-6c756e10.cust.bredbandsbolaget.se [213.113.127.195]) by mx.google.com with ESMTPS id s10sm1185215bka.64.2011.08.29.04.34.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 04:34:11 -0700 (PDT) From: Per Forlin To: linux-kernel@vger.kernel.org, Linus Walleij , Rabin Vincent Cc: Vinod Koul , linaro-dev@lists.linaro.org, Per Forlin Subject: [PATCH 2/4] dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free(). Date: Mon, 29 Aug 2011 13:33:33 +0200 Message-Id: <1314617615-2394-3-git-send-email-per.forlin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314617615-2394-1-git-send-email-per.forlin@linaro.org> References: <1314617615-2394-1-git-send-email-per.forlin@linaro.org> d40_desc_free() already calls d40_pool_lli_free(). Signed-off-by: Per Forlin --- drivers/dma/ste_dma40.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 486b6c0..37388d1 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -478,7 +478,6 @@ static struct d40_desc *d40_desc_get(struct d40_chan *d40c) list_for_each_entry_safe(d, _d, &d40c->client, node) if (async_tx_test_ack(&d->txd)) { - d40_pool_lli_free(d40c, d); d40_desc_remove(d); desc = d; memset(desc, 0, sizeof(*desc)); @@ -1209,7 +1208,6 @@ static void dma_tasklet(unsigned long data) if (!d40d->cyclic) { if (async_tx_test_ack(&d40d->txd)) { - d40_pool_lli_free(d40c, d40d); d40_desc_remove(d40d); d40_desc_free(d40c, d40d); } else { @@ -1606,7 +1604,6 @@ static int d40_free_dma(struct d40_chan *d40c) /* Release client owned descriptors */ if (!list_empty(&d40c->client)) list_for_each_entry_safe(d, _d, &d40c->client, node) { - d40_pool_lli_free(d40c, d); d40_desc_remove(d); d40_desc_free(d40c, d); }