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=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 7BBE3C28CF6 for ; Fri, 3 Aug 2018 07:25:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DCBE7215F9 for ; Fri, 3 Aug 2018 07:25:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=iluvatar.ai header.i=@iluvatar.ai header.b="qCwZ3Xqm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCBE7215F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=iluvatar.ai 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 S1732271AbeHCJQZ (ORCPT ); Fri, 3 Aug 2018 05:16:25 -0400 Received: from mail.iluvatar.ai ([58.213.90.100]:56904 "EHLO mail.iluvatar.ai" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728037AbeHCJQY (ORCPT ); Fri, 3 Aug 2018 05:16:24 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.iluvatar.ai (Postfix) with ESMTP id 86D3513ED1C8B; Fri, 3 Aug 2018 15:24:51 +0800 (CST) Received: from mail.iluvatar.ai ([127.0.0.1]) by localhost (mail.iluvatar.ai [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id pmyv79IRMPo1; Fri, 3 Aug 2018 15:24:51 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by mail.iluvatar.ai (Postfix) with ESMTP id 2C9911426302A; Fri, 3 Aug 2018 15:24:51 +0800 (CST) DKIM-Filter: OpenDKIM Filter v2.9.2 mail.iluvatar.ai 2C9911426302A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iluvatar.ai; s=809B2F8E-810B-11E8-86FD-A0A654EEFFEB; t=1533281091; bh=WzThypY3aHZFrYCGZ8MYs7dbvijbeImufOZ05zxOfxs=; h=From:To:Subject:Date:Message-Id; b=qCwZ3XqmEPn0O+jHP599a/jyl/OUhF/r51qFdQhxvlP6JoSDixQup5+pWdiUh+yUx m7BxlZJLURh1wTg24PhznIteXonwLMPI75x3l3nJwxHc0yH0u/cJB8R7g/ltlsUN3u HnkD6JCTTUBOuEbazWcatmTePa48V4cleoHSfVPo= X-Virus-Scanned: amavisd-new at iluvatar.ai Received: from mail.iluvatar.ai ([127.0.0.1]) by localhost (mail.iluvatar.ai [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mckgFgI-RwEv; Fri, 3 Aug 2018 15:24:51 +0800 (CST) Received: from localhost.localdomain (unknown [180.166.124.10]) by mail.iluvatar.ai (Postfix) with ESMTPSA id D733E13ED1C8B; Fri, 3 Aug 2018 15:24:48 +0800 (CST) From: Huang Shijie To: vkoul@kernel.org Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, dave.jiang@intel.com, radhey.shyam.pandey@xilinx.com, appana.durga.rao@xilinx.com, jmkrzyszt@gmail.com, gomonovych@gmail.com, peter.ujfalusi@ti.com, keescook@chromium.org, horms+renesas@verge.net.au, geert+renesas@glider.be, shawnguo@kernel.org, baoyou.xie@linaro.org, michal.simek@xilinx.com, baohua@kernel.org, ludovic.desroches@microchip.com, linus.walleij@linaro.org, david.brown@linaro.org, Huang Shijie Subject: [PATCH 04/46] dmaengine: xgene-dma: use dmaenginem_async_device_register to simplify the code Date: Fri, 3 Aug 2018 15:19:34 +0800 Message-Id: <20180803072016.21544-5-sjhuang@iluvatar.ai> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180803072016.21544-1-sjhuang@iluvatar.ai> References: <20180803072016.21544-1-sjhuang@iluvatar.ai> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use dmaenginem_async_device_register to simplify the code: remove xgene_dma_async_register remove dma_async_device_unregister Signed-off-by: Huang Shijie --- drivers/dma/xgene-dma.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c index 1d5988849aa6..192322bbdc29 100644 --- a/drivers/dma/xgene-dma.c +++ b/drivers/dma/xgene-dma.c @@ -1564,7 +1564,7 @@ static int xgene_dma_async_register(struct xgene_dma *pdma, int id) list_add_tail(&chan->dma_chan.device_node, &dma_dev->channels); /* Register with Linux async DMA framework*/ - ret = dma_async_device_register(dma_dev); + ret = dmaenginem_async_device_register(dma_dev); if (ret) { chan_err(chan, "Failed to register async device %d", ret); tasklet_kill(&chan->tasklet); @@ -1588,10 +1588,8 @@ static int xgene_dma_init_async(struct xgene_dma *pdma) for (i = 0; i < XGENE_DMA_MAX_CHANNEL ; i++) { ret = xgene_dma_async_register(pdma, i); if (ret) { - for (j = 0; j < i; j++) { - dma_async_device_unregister(&pdma->dma_dev[j]); + for (j = 0; j < i; j++) tasklet_kill(&pdma->chan[j].tasklet); - } return ret; } @@ -1600,14 +1598,6 @@ static int xgene_dma_init_async(struct xgene_dma *pdma) return ret; } -static void xgene_dma_async_unregister(struct xgene_dma *pdma) -{ - int i; - - for (i = 0; i < XGENE_DMA_MAX_CHANNEL; i++) - dma_async_device_unregister(&pdma->dma_dev[i]); -} - static void xgene_dma_init_channels(struct xgene_dma *pdma) { struct xgene_dma_chan *chan; @@ -1796,8 +1786,6 @@ static int xgene_dma_remove(struct platform_device *pdev) struct xgene_dma_chan *chan; int i; - xgene_dma_async_unregister(pdma); - /* Mask interrupts and disable DMA engine */ xgene_dma_mask_interrupts(pdma); xgene_dma_disable(pdma); -- 2.17.1