From: Jonathan Cameron <jic23@kernel.org>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: <mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com>,
<fabrice.gasnier@st.com>, <vkoul@kernel.org>,
<linux-iio@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>
Subject: Re: [PATCH v3] iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
Date: Sat, 11 Jan 2020 11:00:39 +0000 [thread overview]
Message-ID: <20200111110039.09c6b9dd@archlinux> (raw)
In-Reply-To: <20200108080801.14144-1-peter.ujfalusi@ti.com>
On Wed, 8 Jan 2020 10:08:01 +0200
Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> 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>
> Acked-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the togreg branch of iio.git and pushed out as testing.
thanks,
Jonathan
> ---
> Hi,
>
> Changes since v2:
> - Replace the comment as suggested by Fabrice
>
> Changes since v1:
> - Fall back to IRQ mode only in case of ENODEV
>
> Regards,
> Peter
>
> drivers/iio/adc/stm32-adc.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
> index 3b291d72701c..a8d2414ee2eb 100644
> --- a/drivers/iio/adc/stm32-adc.c
> +++ b/drivers/iio/adc/stm32-adc.c
> @@ -1746,9 +1746,21 @@ static int stm32_adc_dma_request(struct iio_dev *indio_dev)
> struct dma_slave_config config;
> int ret;
>
> - adc->dma_chan = dma_request_slave_channel(&indio_dev->dev, "rx");
> - if (!adc->dma_chan)
> + adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");
> + if (IS_ERR(adc->dma_chan)) {
> + ret = PTR_ERR(adc->dma_chan);
> + if (ret != -ENODEV) {
> + if (ret != -EPROBE_DEFER)
> + dev_err(&indio_dev->dev,
> + "DMA channel request failed with %d\n",
> + ret);
> + return ret;
> + }
> +
> + /* DMA is optional: fall back to IRQ mode */
> + adc->dma_chan = NULL;
> return 0;
> + }
>
> adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev,
> STM32_DMA_BUFFER_SIZE,
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: alexandre.torgue@st.com, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, vkoul@kernel.org,
mcoquelin.stm32@gmail.com, fabrice.gasnier@st.com,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3] iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
Date: Sat, 11 Jan 2020 11:00:39 +0000 [thread overview]
Message-ID: <20200111110039.09c6b9dd@archlinux> (raw)
In-Reply-To: <20200108080801.14144-1-peter.ujfalusi@ti.com>
On Wed, 8 Jan 2020 10:08:01 +0200
Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> 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>
> Acked-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Applied to the togreg branch of iio.git and pushed out as testing.
thanks,
Jonathan
> ---
> Hi,
>
> Changes since v2:
> - Replace the comment as suggested by Fabrice
>
> Changes since v1:
> - Fall back to IRQ mode only in case of ENODEV
>
> Regards,
> Peter
>
> drivers/iio/adc/stm32-adc.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
> index 3b291d72701c..a8d2414ee2eb 100644
> --- a/drivers/iio/adc/stm32-adc.c
> +++ b/drivers/iio/adc/stm32-adc.c
> @@ -1746,9 +1746,21 @@ static int stm32_adc_dma_request(struct iio_dev *indio_dev)
> struct dma_slave_config config;
> int ret;
>
> - adc->dma_chan = dma_request_slave_channel(&indio_dev->dev, "rx");
> - if (!adc->dma_chan)
> + adc->dma_chan = dma_request_chan(&indio_dev->dev, "rx");
> + if (IS_ERR(adc->dma_chan)) {
> + ret = PTR_ERR(adc->dma_chan);
> + if (ret != -ENODEV) {
> + if (ret != -EPROBE_DEFER)
> + dev_err(&indio_dev->dev,
> + "DMA channel request failed with %d\n",
> + ret);
> + return ret;
> + }
> +
> + /* DMA is optional: fall back to IRQ mode */
> + adc->dma_chan = NULL;
> return 0;
> + }
>
> adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev,
> STM32_DMA_BUFFER_SIZE,
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-11 11:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 8:08 [PATCH v3] iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel() Peter Ujfalusi
2020-01-08 8:08 ` Peter Ujfalusi
2020-01-11 11:00 ` Jonathan Cameron [this message]
2020-01-11 11:00 ` Jonathan Cameron
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=20200111110039.09c6b9dd@archlinux \
--to=jic23@kernel.org \
--cc=alexandre.torgue@st.com \
--cc=fabrice.gasnier@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=peter.ujfalusi@ti.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 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.