summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-01-03 22:38:12 +0000
committerDan Williams <dan.j.williams@intel.com>2011-01-04 19:16:12 -0800
commitbfddfb45056fa95a778f0baf463ac0f9fc926d5c (patch)
tree1839abe79a06f4a7653847b6cc951cc7a08cf01f /drivers/dma
parente25761d72c80751c8741f5f93abab14232eef347 (diff)
downloadop-kernel-dev-bfddfb45056fa95a778f0baf463ac0f9fc926d5c.zip
op-kernel-dev-bfddfb45056fa95a778f0baf463ac0f9fc926d5c.tar.gz
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 a389df5..a897315 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -111,7 +111,7 @@ struct vendor_data {
struct pl08x_lli {
u32 src;
u32 dst;
- u32 next;
+ u32 lli;
u32 cctl;
};
@@ -375,7 +375,7 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan)
/*
* A LLI pointer of 0 terminates the LLI list
*/
- clli = llis_va[i].next;
+ clli = llis_va[i].lli;
i++;
}
}
@@ -577,7 +577,7 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
* memory. So we don't manipulate this bit currently.
*/
- llis_va[num_llis].next = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
+ llis_va[num_llis].lli = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);
if (cctl & PL080_CONTROL_SRC_INCR)
txd->srcbus.addr += len;
@@ -925,7 +925,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
/*
* The final LLI terminates the LLI.
*/
- llis_va[num_llis - 1].next = 0;
+ llis_va[num_llis - 1].lli = 0;
/*
* The final LLI element shall also fire an interrupt
*/
@@ -934,7 +934,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
/* Now store the channel register values */
txd->csrc = llis_va[0].src;
txd->cdst = llis_va[0].dst;
- txd->clli = llis_va[0].next;
+ txd->clli = llis_va[0].lli;
txd->cctl = llis_va[0].cctl;
/* ccfg will be set at physical channel allocation time */
@@ -950,7 +950,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
llis_va[i].src,
llis_va[i].dst,
llis_va[i].cctl,
- llis_va[i].next
+ llis_va[i].lli
);
}
}
OpenPOWER on IntegriCloud