All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Paul Cercueil <paul@crapouillou.net>
Cc: linux-mmc@vger.kernel.org, linux-mips@linux-mips.org,
	James Hogan <jhogan@kernel.org>,
	Ezequiel Garcia <ezequiel@collabora.co.uk>
Subject: [PATCH v2 10/14] mmc: jz4740: Use dma_request_chan()
Date: Mon, 12 Mar 2018 18:55:50 -0300	[thread overview]
Message-ID: <20180312215554.20770-11-ezequiel@vanguardiasur.com.ar> (raw)
In-Reply-To: <20180312215554.20770-1-ezequiel@vanguardiasur.com.ar>

From: Ezequiel Garcia <ezequiel@collabora.co.uk>

Replace dma_request_channel() with dma_request_chan(),
which also supports probing from the devicetree.

Tested-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.co.uk>
---
 drivers/mmc/host/jz4740_mmc.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index c3ec8e662706..37183fe32ef8 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -225,31 +225,23 @@ static void jz4740_mmc_release_dma_channels(struct jz4740_mmc_host *host)
 
 static int jz4740_mmc_acquire_dma_channels(struct jz4740_mmc_host *host)
 {
-	dma_cap_mask_t mask;
-
-	dma_cap_zero(mask);
-	dma_cap_set(DMA_SLAVE, mask);
-
-	host->dma_tx = dma_request_channel(mask, NULL, host);
-	if (!host->dma_tx) {
+	host->dma_tx = dma_request_chan(mmc_dev(host->mmc), "tx");
+	if (IS_ERR(host->dma_tx)) {
 		dev_err(mmc_dev(host->mmc), "Failed to get dma_tx channel\n");
-		return -ENODEV;
+		return PTR_ERR(host->dma_tx);
 	}
 
-	host->dma_rx = dma_request_channel(mask, NULL, host);
-	if (!host->dma_rx) {
+	host->dma_rx = dma_request_chan(mmc_dev(host->mmc), "rx");
+	if (IS_ERR(host->dma_rx)) {
 		dev_err(mmc_dev(host->mmc), "Failed to get dma_rx channel\n");
-		goto free_master_write;
+		dma_release_channel(host->dma_tx);
+		return PTR_ERR(host->dma_rx);
 	}
 
 	/* Initialize DMA pre request cookie */
 	host->next_data.cookie = 1;
 
 	return 0;
-
-free_master_write:
-	dma_release_channel(host->dma_tx);
-	return -ENODEV;
 }
 
 static inline struct dma_chan *jz4740_mmc_get_dma_chan(struct jz4740_mmc_host *host,
-- 
2.16.2

  parent reply	other threads:[~2018-03-12 22:01 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-12 21:55 [PATCH v2 00/14] Enable SD/MMC on JZ4780 SoCs Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 01/14] mmc: jz4740: Fix race condition in IRQ mask update Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 02/14] mmc: jz4740: Fix error exit path in driver's probe Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 03/14] mmc: jz4780: Order headers alphabetically Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 04/14] mmc: jz4740: Use dev_get_platdata Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 05/14] mmc: jz4740: Reset the device requesting the interrupt Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 06/14] mmc: jz4740: Introduce devicetree probe Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 07/14] mmc: dt-bindings: add MMC support to JZ4740 SoC Ezequiel Garcia
2018-03-18 12:49   ` Rob Herring
2018-03-12 21:55 ` [PATCH v2 08/14] mmc: jz4740: Set clock rate to mmc->f_max rather than JZ_MMC_CLK_RATE Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 09/14] mmc: jz4740: Add support for the JZ4780 Ezequiel Garcia
2018-03-12 21:55 ` Ezequiel Garcia [this message]
2018-03-15 20:59   ` [PATCH v2 10/14] mmc: jz4740: Use dma_request_chan() Paul Cercueil
2018-03-15 21:12     ` Ezequiel Garcia
2018-03-15 22:33       ` Paul Cercueil
2018-03-12 21:55 ` [PATCH v2 11/14] MIPS: dts: jz4780: Add DMA controller node to the devicetree Ezequiel Garcia
2018-03-12 22:31   ` James Hogan
2018-03-15  9:46     ` Ulf Hansson
2018-03-12 21:55 ` [PATCH v2 12/14] MIPS: dts: jz4780: Add MMC " Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 13/14] MIPS: dts: ci20: Enable MMC in " Ezequiel Garcia
2018-03-12 21:55 ` [PATCH v2 14/14] MIPS: configs: ci20: Enable DMA and MMC support Ezequiel Garcia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180312215554.20770-11-ezequiel@vanguardiasur.com.ar \
    --to=ezequiel@vanguardiasur.com.ar \
    --cc=ezequiel@collabora.co.uk \
    --cc=jhogan@kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=paul@crapouillou.net \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.