From 62261d5d13ad0f97af0533468ee53b25206e80d1 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Mon, 3 Jan 2011 22:38:12 +0000 Subject: [PATCH] --- yaml --- r: 231588 b: refs/heads/master c: bfddfb45056fa95a778f0baf463ac0f9fc926d5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b107b44a0b2c..28d7c35bb5ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e25761d72c80751c8741f5f93abab14232eef347 +refs/heads/master: bfddfb45056fa95a778f0baf463ac0f9fc926d5c diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c index a389df501f70..a897315261bc 100644 --- a/trunk/drivers/dma/amba-pl08x.c +++ b/trunk/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 ); } }