Skip to content

Commit

Permalink
ARM: PL08x: rename lli.next to lli.lli
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King - ARM Linux authored and Dan Williams committed Jan 5, 2011
1 parent e25761d commit bfddfb4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/dma/amba-pl08x.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ struct vendor_data {
struct pl08x_lli {
u32 src;
u32 dst;
u32 next;
u32 lli;
u32 cctl;
};

Expand Down Expand Up @@ -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++;
}
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
*/
Expand All @@ -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 */

Expand All @@ -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
);
}
}
Expand Down

0 comments on commit bfddfb4

Please sign in to comment.