From patchwork Mon Jun 25 13:15:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 139844 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3979721lji; Mon, 25 Jun 2018 06:16:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpezuBjSALVUmZ7idKSVljOabRRzvIIcx7IvweXKAR7SQcDP7pBL4r4A5cjjOy1pq1x0ok6U X-Received: by 2002:a1c:b801:: with SMTP id i1-v6mr991103wmf.30.1529932563041; Mon, 25 Jun 2018 06:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529932563; cv=none; d=google.com; s=arc-20160816; b=lvME/nd2OmBKHPSC+WdI6KO4NnQHlQWO+Az4qKb3cZpF+cIOs1Ep+xW/786cO7yu0y PzkaM5cl5wGuW6siVlaJ9tgBu9cbtP5R0tn0gofAv5x5TffikpLet079R4lIcPzqSmnK /AdEa++IExSCwr8dqVK18z34kWWBDizkCu14notXkri90uWeJ3BjDylUbCI/A/SAFYYi GgI6Z/gEQZFuoh8GTOUv2OqBgOrQGiDESyucZjr6dfxOU4wyYJwiuepyyJE/7AhdBJnh YdMlOU6MM45hjlwnK+rdeA144e6QoO+SZX+wFDOyHznusekYmG9eh0Hul0WOzVzzY++g layA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=0DjPXBjU8nULB9R1A+ysWPlkWAd4+N9htRwG+nD4c3k=; b=Rc5eR83TVPFaNfiB2pYT1BgRHxLlybrNVQhUk7gEBiomzUSQxHjw7Brpc+Ys7J+w0d gpk53w1yrQUlcOgvY5SfeXROJDteMumuh5/2VqPQf3HyF5mAyE9mtDSaKDszZ2tu3Yyl 1WDbQPTJzGmkYQBOuznnOjJ3p4DrI7tWvqn9ctgsL8ToniZVRMgjkZsbyo6QlfcoiSFD L91xvLj7fCJx3l26MTXiHudzSBhOuH83qU2b386GFXC5cMJM9KvDWcGvKdWm3Cm5vyW0 G5z+bEgNR36DIouqCl7ozqRiukKL3G6wF6G4Ziejk8odhKH/q2fUa5giyJcKjQwu8LU9 50GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=facO2Klc; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id l16-v6si6573470wrf.399.2018.06.25.06.16.02; Mon, 25 Jun 2018 06:16:03 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=facO2Klc; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5F1E92677F0; Mon, 25 Jun 2018 15:15:46 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0568A2677FD; Mon, 25 Jun 2018 15:15:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 244862677F0 for ; Mon, 25 Jun 2018 15:15:39 +0200 (CEST) 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=hfb1dfrRWy7Qv9HBuw4a/NxmGz4tfCmHCZvnD0PsiEw=; b=facO2KlcofLE vWxztpOjd2FhHCR14izIgGP1XUoiy2UQMrkD1KEyE2VDdUtYGLU1cl/jrxXRkt7jl7r4bcIKycuXE u58FSN41h45rr6YDHlvVIcpQ+uTtIS6VYZ3MZ4kk8MEpW1kuQbYSqOTaIZU4oazgt1R5wrhwGRhT0 cjIeA=; 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 1fXRL0-0007rm-Tu; Mon, 25 Jun 2018 13:15:23 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fXRL0-0008N1-GA; Mon, 25 Jun 2018 14:15:22 +0100 From: Mark Brown To: Robert Jarzmik In-Reply-To: <20180524070703.11901-10-robert.jarzmik@free.fr> Message-Id: Date: Mon, 25 Jun 2018 14:15:22 +0100 Cc: linux-ide@vger.kernel.org, Boris Brezillon , alsa-devel@alsa-project.org, Arnd Bergmann , Bartlomiej Zolnierkiewicz , Richard Weinberger , linux-mmc@vger.kernel.org, Liam Girdwood , Haojian Zhuang , linux-kernel@vger.kernel.org, Marek Vasut , Mark Brown , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Ezequiel Garcia , netdev@vger.kernel.org, dmaengine@vger.kernel.org, Brian Norris , David Woodhouse , Daniel Mack , linux-media@vger.kernel.org Subject: [alsa-devel] Applied "ata: pata_pxa: remove the dmaengine compat need" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ata: pata_pxa: remove the dmaengine compat need has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.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 273340e8bf86de53eef7073993352ea11c563696 Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Sun, 17 Jun 2018 19:02:13 +0200 Subject: [PATCH] ata: pata_pxa: remove the dmaengine compat need As the pxa architecture switched towards the dmaengine slave map, the old compatibility mechanism to acquire the dma requestor line number and priority are not needed anymore. This patch simplifies the dma resource acquisition, using the more generic function dma_request_slave_channel(). Signed-off-by: Robert Jarzmik Acked-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_pxa.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index f6c46e9a4dc0..e8b6a2e464c9 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -180,8 +179,6 @@ static int pxa_ata_probe(struct platform_device *pdev) struct resource *irq_res; struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev); struct dma_slave_config config; - dma_cap_mask_t mask; - struct pxad_param param; int ret = 0; /* @@ -278,10 +275,6 @@ static int pxa_ata_probe(struct platform_device *pdev) ap->private_data = data; - dma_cap_zero(mask); - dma_cap_set(DMA_SLAVE, mask); - param.prio = PXAD_PRIO_LOWEST; - param.drcmr = pdata->dma_dreq; memset(&config, 0, sizeof(config)); config.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; config.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; @@ -294,8 +287,7 @@ static int pxa_ata_probe(struct platform_device *pdev) * Request the DMA channel */ data->dma_chan = - dma_request_slave_channel_compat(mask, pxad_filter_fn, - ¶m, &pdev->dev, "data"); + dma_request_slave_channel(&pdev->dev, "data"); if (!data->dma_chan) return -EBUSY; ret = dmaengine_slave_config(data->dma_chan, &config);