Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp142762imm; Fri, 3 Aug 2018 00:42:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpefRDIgTgWPt5agAy93yILg70amQm/jRZzECTehUcQmdrE2lmk5Mxs+ba6VxbbMC5X0dAZQ X-Received: by 2002:a63:e318:: with SMTP id f24-v6mr2529026pgh.175.1533282170986; Fri, 03 Aug 2018 00:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533282170; cv=none; d=google.com; s=arc-20160816; b=WOJ/etX4T7J1P7TR1DzmsMb6NNkDQsLBUCcKkI0XhSnNlTWVjpKSjdlQDrPQoRizjC YnF/74oyapj2Im1cCaDW/r24uLA16xuMPD1TMdIFH9lwUSUBz6uarX9unA8UtF2k+uw3 0PbAmn+TQz4GPtc+DIhLuRLZgbtSttbjW60QMzBSCCEMsjoAHGfKnQWpWNSpagFE+Y5G a+NJwo5DBVddz+PWFOvosNrjKBNT84EE04mEOEsPJs7MWI5mLrdnXTafdbZNHse5MbXf RPsUA1+OzeqWOKfQtnbapaN21AeyA9tCdUY5vZBLJofqULzFcmRQAztgyRaPRrKhxGqv YAzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=WzThypY3aHZFrYCGZ8MYs7dbvijbeImufOZ05zxOfxs=; b=M7BZ/lrpcoONFBstdyb4z49qotGgkwPcM7CQ0AY6JxYl8HW3NyNf7KKSoi4qd6vDRb 1cr5F0iAnU2vpBbW9oUlJBzhW5dn2YsrCo1ZdMpZyBMB/jUQc91hhDabYf8Rh5rGbzBI AVcnW6a2pQ61FdAFbJnOY7t700T35t8JyixLaQMB9whnirhKslewt6wEnlVTs1+sgpn1 4b7SlapXz1RCG7QwBmpehGEk73WDRDUi7lNrap/qkmWXrXsY2KhGyXfgvPMIsye9f5kL pgcMvaJDKD40KZ6BGhopgp6A2SSZvbNZMitxxGmwsD2LDkqKyC80KQD0Z/1uE1FNhVOJ Z+Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@iluvatar.ai header.s=809B2F8E-810B-11E8-86FD-A0A654EEFFEB header.b=qCwZ3Xqm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=iluvatar.ai Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b74-v6si4726081pfd.273.2018.08.03.00.42.36; Fri, 03 Aug 2018 00:42:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@iluvatar.ai header.s=809B2F8E-810B-11E8-86FD-A0A654EEFFEB header.b=qCwZ3Xqm; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=iluvatar.ai Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732261AbeHCJQZ (ORCPT + 99 others); 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