From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <mchehab@kernel.org>, <rashanmu@gmail.com>, <geert@linux-m68k.org>
Cc: <vkoul@kernel.org>, <linux-media@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-renesas-soc@vger.kernel.org>
Subject: [PATCH v2] media: rcar_drif: Use dma_request_chan() instead dma_request_slave_channel()
Date: Mon, 20 Jan 2020 14:47:54 +0200 [thread overview]
Message-ID: <20200120124754.26826-1-peter.ujfalusi@ti.com> (raw)
dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.
By using dma_request_chan() directly the driver can support deferred
probing against DMA.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Hi,
Changes since v2:
- Use %pe to print error name using the ch->dmach pointer
- Set ch->dmach to NULL in case of error
Changes since v1:
- Do not print error in case of EPROBE_DEFER
- Added Reviewed-by from Geert
Regards,
Peter
drivers/media/platform/rcar_drif.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c
index 0f267a237b42..3d2451ac347d 100644
--- a/drivers/media/platform/rcar_drif.c
+++ b/drivers/media/platform/rcar_drif.c
@@ -275,10 +275,14 @@ static int rcar_drif_alloc_dmachannels(struct rcar_drif_sdr *sdr)
for_each_rcar_drif_channel(i, &sdr->cur_ch_mask) {
struct rcar_drif *ch = sdr->ch[i];
- ch->dmach = dma_request_slave_channel(&ch->pdev->dev, "rx");
- if (!ch->dmach) {
- rdrif_err(sdr, "ch%u: dma channel req failed\n", i);
- ret = -ENODEV;
+ ch->dmach = dma_request_chan(&ch->pdev->dev, "rx");
+ if (IS_ERR(ch->dmach)) {
+ ret = PTR_ERR(ch->dmach);
+ if (ret != -EPROBE_DEFER)
+ rdrif_err(sdr,
+ "ch%u: dma channel req failed: %pe\n",
+ i, ch->dmach);
+ ch->dmach = NULL;
goto dmach_error;
}
--
Peter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next reply other threads:[~2020-01-20 12:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 12:47 Peter Ujfalusi [this message]
2020-01-20 12:49 ` [PATCH v2] media: rcar_drif: Use dma_request_chan() instead dma_request_slave_channel() Peter Ujfalusi
2020-02-25 12:07 ` Hans Verkuil
2020-02-26 9:22 ` Peter Ujfalusi
-- strict thread matches above, loose matches on Subject: below --
2020-01-20 12:36 Peter Ujfalusi
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=20200120124754.26826-1-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rashanmu@gmail.com \
--cc=vkoul@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).