aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-03 17:38:12 -0500
committerDan Williams <dan.j.williams@intel.com>2011-01-04 22:16:12 -0500
commitbfddfb45056fa95a778f0baf463ac0f9fc926d5c (patch)
tree1839abe79a06f4a7653847b6cc951cc7a08cf01f /drivers/dma
parente25761d72c80751c8741f5f93abab14232eef347 (diff)
ARM: PL08x: rename lli.next to lli.lli
The LLI pointer in the documentation is placed into the LLI register, so name it LLI rather than 'next'. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/amba-pl08x.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index a389df501f70..a897315261bc 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -111,7 +111,7 @@ struct vendor_data {
111struct pl08x_lli { 111struct pl08x_lli {
112 u32 src; 112 u32 src;
113 u32 dst; 113 u32 dst;
114 u32 next; 114 u32 lli;
115 u32 cctl; 115 u32 cctl;
116}; 116};
117 117
@@ -375,7 +375,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
375 /* 375 /*
376 * A LLI pointer of 0 terminates the LLI list 376 * A LLI pointer of 0 terminates the LLI list
377 */ 377 */
378 clli = llis_va[i].next; 378 clli = llis_va[i].lli;
379 i++; 379 i++;
380 } 380 }
381 } 381 }
@@ -577,7 +577,7 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
577 * memory. So we don't manipulate this bit currently. 577 * memory. So we don't manipulate this bit currently.
578 */ 578 */
579 579
580 llis_va[num_llis].next = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli); 580 llis_va[num_llis].lli = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
581 581
582 if (cctl & PL080_CONTROL_SRC_INCR) 582 if (cctl & PL080_CONTROL_SRC_INCR)
583 txd->srcbus.addr += len; 583 txd->srcbus.addr += len;
@@ -925,7 +925,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
925 /* 925 /*
926 * The final LLI terminates the LLI. 926 * The final LLI terminates the LLI.
927 */ 927 */
928 llis_va[num_llis - 1].next = 0; 928 llis_va[num_llis - 1].lli = 0;
929 /* 929 /*
930 * The final LLI element shall also fire an interrupt 930 * The final LLI element shall also fire an interrupt
931 */ 931 */
@@ -934,7 +934,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
934 /* Now store the channel register values */ 934 /* Now store the channel register values */
935 txd->csrc = llis_va[0].src; 935 txd->csrc = llis_va[0].src;
936 txd->cdst = llis_va[0].dst; 936 txd->cdst = llis_va[0].dst;
937 txd->clli = llis_va[0].next; 937 txd->clli = llis_va[0].lli;
938 txd->cctl = llis_va[0].cctl; 938 txd->cctl = llis_va[0].cctl;
939 /* ccfg will be set at physical channel allocation time */ 939 /* ccfg will be set at physical channel allocation time */
940 940
@@ -950,7 +950,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
950 llis_va[i].src, 950 llis_va[i].src,
951 llis_va[i].dst, 951 llis_va[i].dst,
952 llis_va[i].cctl, 952 llis_va[i].cctl,
953 llis_va[i].next 953 llis_va[i].lli
954 ); 954 );
955 } 955 }
956 } 956 }