From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: dmaengine@vger.kernel.org, "Vinod Koul" <vinod.koul@intel.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Antoine Ténart" <antoine@free-electrons.com>,
lars@metafoo.de, "Russell King" <linux@arm.linux.org.uk>,
"Stephen Warren" <swarren@wwwdotorg.org>,
"Dan Williams" <dan.j.williams@intel.com>,
"Barry Song" <baohua@kernel.org>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.de>,
linux-rpi-kernel@lists.infradead.org,
alsa-devel@alsa-project.org
Subject: Re: [PATCH v2 01/53] dmaengine: Make the destination abbreviation coherent
Date: Thu, 16 Oct 2014 13:32:49 +0300 [thread overview]
Message-ID: <5335885.21hphHy9fc@avalon> (raw)
In-Reply-To: <1413454672-27400-2-git-send-email-maxime.ripard@free-electrons.com>
Hi Maxime,
Thank you for the patch.
On Thursday 16 October 2014 12:17:00 Maxime Ripard wrote:
> The dmaengine header abbreviates destination as at least two different
> strings. Make a coherent use of a single one.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/dma/bcm2835-dma.c | 2 +-
> drivers/dma/edma.c | 2 +-
> drivers/dma/fsl-edma.c | 2 +-
> drivers/dma/nbpfaxi.c | 2 +-
> drivers/dma/omap-dma.c | 2 +-
> drivers/dma/pl330.c | 2 +-
> drivers/dma/sirf-dma.c | 2 +-
> include/linux/dmaengine.h | 12 ++++++------
> sound/soc/soc-generic-dmaengine-pcm.c | 2 +-
> 9 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
> index 68007974961a..8a6a9c27fe83 100644
> --- a/drivers/dma/bcm2835-dma.c
> +++ b/drivers/dma/bcm2835-dma.c
> @@ -571,7 +571,7 @@ static int bcm2835_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
> - caps->dstn_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
> + caps->dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = false;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
> index 7b65633f495e..b3d641881d9d 100644
> --- a/drivers/dma/edma.c
> +++ b/drivers/dma/edma.c
> @@ -998,7 +998,7 @@ static int edma_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = EDMA_DMA_BUSWIDTHS;
> - caps->dstn_addr_widths = EDMA_DMA_BUSWIDTHS;
> + caps->dst_addr_widths = EDMA_DMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = true;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
> index 3c5711d5fe97..13df85a16438 100644
> --- a/drivers/dma/fsl-edma.c
> +++ b/drivers/dma/fsl-edma.c
> @@ -781,7 +781,7 @@ static int fsl_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = FSL_EDMA_BUSWIDTHS;
> - caps->dstn_addr_widths = FSL_EDMA_BUSWIDTHS;
> + caps->dst_addr_widths = FSL_EDMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = true;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c
> index 5aeada56a442..b4a61ccbb443 100644
> --- a/drivers/dma/nbpfaxi.c
> +++ b/drivers/dma/nbpfaxi.c
> @@ -1076,7 +1076,7 @@ static int nbpf_slave_caps(struct dma_chan *dchan,
> struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = NBPF_DMA_BUSWIDTHS;
> - caps->dstn_addr_widths = NBPF_DMA_BUSWIDTHS;
> + caps->dst_addr_widths = NBPF_DMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = false;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
> index 4cf7d9a950d7..51dee6636a37 100644
> --- a/drivers/dma/omap-dma.c
> +++ b/drivers/dma/omap-dma.c
> @@ -1095,7 +1095,7 @@ static int omap_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = OMAP_DMA_BUSWIDTHS;
> - caps->dstn_addr_widths = OMAP_DMA_BUSWIDTHS;
> + caps->dst_addr_widths = OMAP_DMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = true;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index d5149aacd2fe..8904891ed5d5 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -2583,7 +2583,7 @@ static int pl330_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = PL330_DMA_BUSWIDTHS;
> - caps->dstn_addr_widths = PL330_DMA_BUSWIDTHS;
> + caps->dst_addr_widths = PL330_DMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = false;
> caps->cmd_terminate = true;
> diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
> index aac03ab10c54..149d7fddfa75 100644
> --- a/drivers/dma/sirf-dma.c
> +++ b/drivers/dma/sirf-dma.c
> @@ -652,7 +652,7 @@ static int sirfsoc_dma_device_slave_caps(struct dma_chan
> *dchan, struct dma_slave_caps *caps)
> {
> caps->src_addr_widths = SIRFSOC_DMA_BUSWIDTHS;
> - caps->dstn_addr_widths = SIRFSOC_DMA_BUSWIDTHS;
> + caps->dst_addr_widths = SIRFSOC_DMA_BUSWIDTHS;
> caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
> caps->cmd_pause = true;
> caps->cmd_terminate = true;
> diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> index 1f9e642c66ad..f4b71ce1a0a6 100644
> --- a/include/linux/dmaengine.h
> +++ b/include/linux/dmaengine.h
> @@ -388,7 +388,7 @@ enum dma_residue_granularity {
> /* struct dma_slave_caps - expose capabilities of a slave channel only
> *
> * @src_addr_widths: bit mask of src addr widths the channel supports
> - * @dstn_addr_widths: bit mask of dstn addr widths the channel supports
> + * @dst_addr_widths: bit mask of dstn addr widths the channel supports
> * @directions: bit mask of slave direction the channel supported
> * since the enum dma_transfer_direction is not defined as bits for each
> * type of direction, the dma controller should fill (1 << <TYPE>) and
> same @@ -399,7 +399,7 @@ enum dma_residue_granularity {
> */
> struct dma_slave_caps {
> u32 src_addr_widths;
> - u32 dstn_addr_widths;
> + u32 dst_addr_widths;
> u32 directions;
> bool cmd_pause;
> bool cmd_terminate;
> @@ -639,10 +639,10 @@ struct dma_device {
> void (*device_free_chan_resources)(struct dma_chan *chan);
>
> struct dma_async_tx_descriptor *(*device_prep_dma_memcpy)(
> - struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
> + struct dma_chan *chan, dma_addr_t dst, dma_addr_t src,
> size_t len, unsigned long flags);
> struct dma_async_tx_descriptor *(*device_prep_dma_xor)(
> - struct dma_chan *chan, dma_addr_t dest, dma_addr_t *src,
> + struct dma_chan *chan, dma_addr_t dst, dma_addr_t *src,
> unsigned int src_cnt, size_t len, unsigned long flags);
> struct dma_async_tx_descriptor *(*device_prep_dma_xor_val)(
> struct dma_chan *chan, dma_addr_t *src, unsigned int src_cnt,
> @@ -935,11 +935,11 @@ async_dma_find_channel(enum dma_transaction_type type)
> #endif /* CONFIG_ASYNC_TX_DMA */
>
> dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan,
> - void *dest, void *src, size_t len);
> + void *dst, void *src, size_t len);
> dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan,
> struct page *page, unsigned int offset, void *kdata, size_t len);
> dma_cookie_t dma_async_memcpy_pg_to_pg(struct dma_chan *chan,
> - struct page *dest_pg, unsigned int dest_off, struct page *src_pg,
> + struct page *dst_pg, unsigned int dst_off, struct page *src_pg,
> unsigned int src_off, size_t len);
> void dma_async_tx_descriptor_init(struct dma_async_tx_descriptor *tx,
> struct dma_chan *chan);
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c
> b/sound/soc/soc-generic-dmaengine-pcm.c index 6307f85e871b..f4661be7de1d
> 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -151,7 +151,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct
> snd_pcm_substream *substrea hw.info |= SNDRV_PCM_INFO_BATCH;
>
> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> - addr_widths = dma_caps.dstn_addr_widths;
> + addr_widths = dma_caps.dst_addr_widths;
> else
> addr_widths = dma_caps.src_addr_widths;
> }
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2014-10-16 10:32 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-16 10:16 [PATCH v2 00/53] dmaengine: Implement generic slave capabilities retrieval Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 01/53] dmaengine: Make the destination abbreviation coherent Maxime Ripard
2014-10-16 10:25 ` Mark Brown
2014-10-16 10:32 ` Laurent Pinchart [this message]
2014-10-16 15:26 ` Stephen Warren
2014-10-16 10:17 ` [PATCH v2 02/53] dmaengine: Make channel allocation callbacks optional Maxime Ripard
2014-10-16 10:35 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 03/53] dmaengine: Introduce a device_config callback Maxime Ripard
2014-10-16 10:44 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 04/53] dmaengine: split out pause/resume operations from device_control Maxime Ripard
2014-10-16 10:45 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 05/53] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-10-16 10:46 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 06/53] dmaengine: Create a generic dma_slave_caps callback Maxime Ripard
2014-10-16 16:15 ` Laurent Pinchart
2014-10-16 16:24 ` Maxime Ripard
2014-10-22 20:16 ` Laurent Pinchart
2014-10-23 8:08 ` Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 07/53] dmaengine: Move slave caps to dma_device Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 08/53] dmaengine: pl08x: Split device_control Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 09/53] dmaengine: hdmac: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 10/53] dmaengine: bcm2835: " Maxime Ripard
2014-10-16 15:27 ` Stephen Warren
2014-10-16 10:17 ` [PATCH v2 11/53] dmaengine: coh901318: " Maxime Ripard
2014-10-28 14:40 ` Linus Walleij
2014-10-16 10:17 ` [PATCH v2 12/53] dmaengine: cppi41: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 13/53] dmaengine: jz4740: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 14/53] dmaengine: dw: " Maxime Ripard
2014-10-16 11:17 ` Andy Shevchenko
2014-10-16 14:05 ` Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 15/53] dmaengine: edma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 16/53] dmaengine: ep93xx: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 17/53] dmaengine: fsl-edma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 18/53] dmaengine: imx: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 19/53] dmaengine: imx-sdma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 20/53] dmaengine: intel-mid-dma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 21/53] dmaengine: ipu-idmac: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 22/53] dmaengine: k3: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 23/53] dmaengine: mmp-pdma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 24/53] dmaengine: mmp-tdma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 25/53] dmaengine: moxart: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 26/53] dmaengine: fsl-dma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 27/53] dmaengine: mpc512x: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 28/53] dmaengine: mxs: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 29/53] dmaengine: nbpfaxi: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 30/53] dmaengine: omap: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 31/53] dmaengine: pl330: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 32/53] dmaengine: bam-dma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 33/53] dmaengine: s3c24xx: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 34/53] dmaengine: sa11x0: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 35/53] dmaengine: sh: " Maxime Ripard
2014-10-16 16:17 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 36/53] dmaengine: sirf: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 37/53] dmaengine: sun6i: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 38/53] dmaengine: d40: " Maxime Ripard
2014-10-28 14:41 ` Linus Walleij
2014-10-16 10:17 ` [PATCH v2 39/53] dmaengine: tegra20: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 40/53] dmaengine: xilinx: " Maxime Ripard
2014-10-16 16:20 ` Laurent Pinchart
2014-10-16 10:17 ` [PATCH v2 41/53] dmaengine: mv_xor: Remove device_control Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 42/53] dmaengine: pch-dma: Rename device_control Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 43/53] dmaengine: td: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 44/53] dmaengine: txx9: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 45/53] dmaengine: bcm2835: Declare slave capabilities for the generic code Maxime Ripard
2014-10-16 15:27 ` Stephen Warren
2014-10-16 10:17 ` [PATCH v2 46/53] dmaengine: fsl-edma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 47/53] dmaengine: edma: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 48/53] dmaengine: nbpfaxi: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 49/53] dmaengine: omap: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 50/53] dmaengine: pl330: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 51/53] dmaengine: sirf: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 52/53] dmaengine: sun6i: " Maxime Ripard
2014-10-16 10:17 ` [PATCH v2 53/53] dmaengine: Mark device_control and device_slave_caps as deprecated Maxime Ripard
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=5335885.21hphHy9fc@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=alsa-devel@alsa-project.org \
--cc=antoine@free-electrons.com \
--cc=baohua@kernel.org \
--cc=broonie@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=maxime.ripard@free-electrons.com \
--cc=perex@perex.cz \
--cc=swarren@wwwdotorg.org \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
/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