Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 738f5f7e1ae876448cb7d9c82bea258b69386647

Authored by Ira Snyder
Committed by Dan Williams
1 parent a4f56d4b10

fsldma: rename dest to dst for uniformity 

Most functions in the standard library use "dst" as a parameter, rather
than "dest". This renames all use of "dest" to "dst" to match the usual
convention.

Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Showing 2 changed files with 17 additions and 17 deletions Side-by-side Diff

drivers/dma/fsldma.c
Diff comments   View file @ 738f5f7
... ... @@ -90,14 +90,14 @@
90 90 hw->src_addr = CPU_TO_DMA(fsl_chan, snoop_bits | src, 64);
91 91 }
92 92  
93   -static void set_desc_dest(struct fsldma_chan *fsl_chan,
94   - struct fsl_dma_ld_hw *hw, dma_addr_t dest)
  93 +static void set_desc_dst(struct fsldma_chan *fsl_chan,
  94 + struct fsl_dma_ld_hw *hw, dma_addr_t dst)
95 95 {
96 96 u64 snoop_bits;
97 97  
98 98 snoop_bits = ((fsl_chan->feature & FSL_DMA_IP_MASK) == FSL_DMA_IP_85XX)
99 99 ? ((u64)FSL_DMA_DATR_DWRITETYPE_SNOOP_WRITE << 32) : 0;
100   - hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dest, 64);
  100 + hw->dst_addr = CPU_TO_DMA(fsl_chan, snoop_bits | dst, 64);
101 101 }
102 102  
103 103 static void set_desc_next(struct fsldma_chan *fsl_chan,
... ... @@ -253,7 +253,7 @@
253 253 }
254 254  
255 255 /**
256   - * fsl_chan_set_dest_loop_size - Set destination address hold transfer size
  256 + * fsl_chan_set_dst_loop_size - Set destination address hold transfer size
257 257 * @fsl_chan : Freescale DMA channel
258 258 * @size : Address loop size, 0 for disable loop
259 259 *
... ... @@ -263,7 +263,7 @@
263 263 * write data to TA, TA + 1, TA + 2, TA + 3, then loop back to TA,
264 264 * TA + 1 ... and so on.
265 265 */
266   -static void fsl_chan_set_dest_loop_size(struct fsldma_chan *fsl_chan, int size)
  266 +static void fsl_chan_set_dst_loop_size(struct fsldma_chan *fsl_chan, int size)
267 267 {
268 268 u32 mode;
269 269  
... ... @@ -486,7 +486,7 @@
486 486 }
487 487  
488 488 static struct dma_async_tx_descriptor *fsl_dma_prep_memcpy(
489   - struct dma_chan *chan, dma_addr_t dma_dest, dma_addr_t dma_src,
  489 + struct dma_chan *chan, dma_addr_t dma_dst, dma_addr_t dma_src,
490 490 size_t len, unsigned long flags)
491 491 {
492 492 struct fsldma_chan *fsl_chan;
... ... @@ -519,7 +519,7 @@
519 519  
520 520 set_desc_cnt(fsl_chan, &new->hw, copy);
521 521 set_desc_src(fsl_chan, &new->hw, dma_src);
522   - set_desc_dest(fsl_chan, &new->hw, dma_dest);
  522 + set_desc_dst(fsl_chan, &new->hw, dma_dst);
523 523  
524 524 if (!first)
525 525 first = new;
... ... @@ -532,7 +532,7 @@
532 532 prev = new;
533 533 len -= copy;
534 534 dma_src += copy;
535   - dma_dest += copy;
  535 + dma_dst += copy;
536 536  
537 537 /* Insert the link descriptor to the LD ring */
538 538 list_add_tail(&new->node, &first->tx_list);
... ... @@ -680,7 +680,7 @@
680 680 /* Fill in the descriptor */
681 681 set_desc_cnt(fsl_chan, &new->hw, copy);
682 682 set_desc_src(fsl_chan, &new->hw, dma_src);
683   - set_desc_dest(fsl_chan, &new->hw, dma_dst);
  683 + set_desc_dst(fsl_chan, &new->hw, dma_dst);
684 684  
685 685 /*
686 686 * If this is not the first descriptor, chain the
... ... @@ -721,8 +721,8 @@
721 721 if (fsl_chan->set_src_loop_size)
722 722 fsl_chan->set_src_loop_size(fsl_chan, slave->src_loop_size);
723 723  
724   - if (fsl_chan->set_dest_loop_size)
725   - fsl_chan->set_dest_loop_size(fsl_chan, slave->dst_loop_size);
  724 + if (fsl_chan->set_dst_loop_size)
  725 + fsl_chan->set_dst_loop_size(fsl_chan, slave->dst_loop_size);
726 726  
727 727 if (fsl_chan->toggle_ext_start)
728 728 fsl_chan->toggle_ext_start(fsl_chan, slave->external_start);
... ... @@ -867,7 +867,7 @@
867 867 static void fsl_chan_xfer_ld_queue(struct fsldma_chan *fsl_chan)
868 868 {
869 869 struct list_head *ld_node;
870   - dma_addr_t next_dest_addr;
  870 + dma_addr_t next_dst_addr;
871 871 unsigned long flags;
872 872  
873 873 spin_lock_irqsave(&fsl_chan->desc_lock, flags);
874 874  
... ... @@ -892,10 +892,10 @@
892 892  
893 893 if (ld_node != &fsl_chan->ld_queue) {
894 894 /* Get the ld start address from ld_queue */
895   - next_dest_addr = to_fsl_desc(ld_node)->async_tx.phys;
  895 + next_dst_addr = to_fsl_desc(ld_node)->async_tx.phys;
896 896 dev_dbg(fsl_chan->dev, "xfer LDs staring from 0x%llx\n",
897   - (unsigned long long)next_dest_addr);
898   - set_cdar(fsl_chan, next_dest_addr);
  897 + (unsigned long long)next_dst_addr);
  898 + set_cdar(fsl_chan, next_dst_addr);
899 899 dma_start(fsl_chan);
900 900 } else {
901 901 set_cdar(fsl_chan, 0);
... ... @@ -1130,7 +1130,7 @@
1130 1130 case FSL_DMA_IP_83XX:
1131 1131 new_fsl_chan->toggle_ext_start = fsl_chan_toggle_ext_start;
1132 1132 new_fsl_chan->set_src_loop_size = fsl_chan_set_src_loop_size;
1133   - new_fsl_chan->set_dest_loop_size = fsl_chan_set_dest_loop_size;
  1133 + new_fsl_chan->set_dst_loop_size = fsl_chan_set_dst_loop_size;
1134 1134 new_fsl_chan->set_request_count = fsl_chan_set_request_count;
1135 1135 }
1136 1136  
drivers/dma/fsldma.h
Diff comments   View file @ 738f5f7
... ... @@ -143,7 +143,7 @@
143 143 void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
144 144 void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);
145 145 void (*set_src_loop_size)(struct fsldma_chan *fsl_chan, int size);
146   - void (*set_dest_loop_size)(struct fsldma_chan *fsl_chan, int size);
  146 + void (*set_dst_loop_size)(struct fsldma_chan *fsl_chan, int size);
147 147 void (*set_request_count)(struct fsldma_chan *fsl_chan, int size);
148 148 };
149 149