Commit ceacbdbf authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 4bba7e93
...@@ -1229,7 +1229,7 @@ static int at_xdmac_device_slave_caps(struct dma_chan *dchan, ...@@ -1229,7 +1229,7 @@ static int at_xdmac_device_slave_caps(struct dma_chan *dchan,
{ {
caps->src_addr_widths = AT_XDMAC_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = true; caps->cmd_pause = true;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -569,7 +569,7 @@ static int bcm2835_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -569,7 +569,7 @@ static int bcm2835_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = false; caps->cmd_pause = false;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -998,7 +998,7 @@ static int edma_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -998,7 +998,7 @@ static int edma_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = EDMA_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = true; caps->cmd_pause = true;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -784,7 +784,7 @@ static int fsl_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -784,7 +784,7 @@ static int fsl_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = FSL_EDMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = true; caps->cmd_pause = true;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -1076,7 +1076,7 @@ static int nbpf_slave_caps(struct dma_chan *dchan, ...@@ -1076,7 +1076,7 @@ static int nbpf_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = NBPF_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = false; caps->cmd_pause = false;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -1098,7 +1098,7 @@ static int omap_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -1098,7 +1098,7 @@ static int omap_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = OMAP_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = true; caps->cmd_pause = true;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -2627,7 +2627,7 @@ static int pl330_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -2627,7 +2627,7 @@ static int pl330_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = PL330_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = false; caps->cmd_pause = false;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -652,7 +652,7 @@ static int sirfsoc_dma_device_slave_caps(struct dma_chan *dchan, ...@@ -652,7 +652,7 @@ static int sirfsoc_dma_device_slave_caps(struct dma_chan *dchan,
struct dma_slave_caps *caps) struct dma_slave_caps *caps)
{ {
caps->src_addr_widths = SIRFSOC_DMA_BUSWIDTHS; 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->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
caps->cmd_pause = true; caps->cmd_pause = true;
caps->cmd_terminate = true; caps->cmd_terminate = true;
......
...@@ -387,7 +387,7 @@ enum dma_residue_granularity { ...@@ -387,7 +387,7 @@ enum dma_residue_granularity {
/* struct dma_slave_caps - expose capabilities of a slave channel only /* struct dma_slave_caps - expose capabilities of a slave channel only
* *
* @src_addr_widths: bit mask of src addr widths the channel supports * @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 * @directions: bit mask of slave direction the channel supported
* since the enum dma_transfer_direction is not defined as bits for each * 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 * type of direction, the dma controller should fill (1 << <TYPE>) and same
...@@ -398,7 +398,7 @@ enum dma_residue_granularity { ...@@ -398,7 +398,7 @@ enum dma_residue_granularity {
*/ */
struct dma_slave_caps { struct dma_slave_caps {
u32 src_addr_widths; u32 src_addr_widths;
u32 dstn_addr_widths; u32 dst_addr_widths;
u32 directions; u32 directions;
bool cmd_pause; bool cmd_pause;
bool cmd_terminate; bool cmd_terminate;
...@@ -639,10 +639,10 @@ struct dma_device { ...@@ -639,10 +639,10 @@ struct dma_device {
void (*device_free_chan_resources)(struct dma_chan *chan); void (*device_free_chan_resources)(struct dma_chan *chan);
struct dma_async_tx_descriptor *(*device_prep_dma_memcpy)( 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); size_t len, unsigned long flags);
struct dma_async_tx_descriptor *(*device_prep_dma_xor)( 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); unsigned int src_cnt, size_t len, unsigned long flags);
struct dma_async_tx_descriptor *(*device_prep_dma_xor_val)( struct dma_async_tx_descriptor *(*device_prep_dma_xor_val)(
struct dma_chan *chan, dma_addr_t *src, unsigned int src_cnt, struct dma_chan *chan, dma_addr_t *src, unsigned int src_cnt,
......
...@@ -151,7 +151,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea ...@@ -151,7 +151,7 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea
hw.info |= SNDRV_PCM_INFO_BATCH; hw.info |= SNDRV_PCM_INFO_BATCH;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
addr_widths = dma_caps.dstn_addr_widths; addr_widths = dma_caps.dst_addr_widths;
else else
addr_widths = dma_caps.src_addr_widths; addr_widths = dma_caps.src_addr_widths;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment