dmaengine: Make the destination abbreviation coherent

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: Mark Brown <broonie@kernel.org>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index b60d77a..ff67466 100644 (file)
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1229,7 +1229,7 @@ static int at_xdmac_device_slave_caps(struct dma_chan *dchan,
 {
 
        caps->src_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;
-       caps->dstn_addr_widths = AT_XDMAC_DMA_BUSWIDTHS;
+       caps->dst_addr_widths = AT_XDMAC_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/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 918b7b3..3feba6c 100644 (file)
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -569,7 +569,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 b969206..2b49fe6 100644 (file)
--- 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 e9ebb89..ce6e960 100644 (file)
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -784,7 +784,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 d7d61e1..3d993e7 100644 (file)
--- 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 c0016a6..ca4645c 100644 (file)
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -1098,7 +1098,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 bdf40b5..4a759c8 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2627,7 +2627,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 3492a5f..11c85fc 100644 (file)
--- 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 40cd75e..03a1feb 100644 (file)
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -387,7 +387,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
@@ -398,7 +398,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,

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index b329b84..851f7af 100644 (file)
--- 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;
        }