Skip to content

Commit

Permalink
ARM: PL08x: don't try to use llis_bus as a pointer
Browse files Browse the repository at this point in the history
llis_bus is the DMA address of the LLI array.  Casting it to be a
pointer just to be able to use pointer arithmetic on it is not nice.
We can trivially deal with the places where we do arithmetic on it,
and it's actually cleaner this way.

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 4c0df6a commit 56b6188
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/dma/amba-pl08x.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
u32 cctl, u32 *remainder)
{
struct pl08x_lli *llis_va = txd->llis_va;
struct pl08x_lli *llis_bus = (struct pl08x_lli *) txd->llis_bus;
dma_addr_t llis_bus = txd->llis_bus;

BUG_ON(num_llis >= MAX_NUM_TSFR_LLIS);

Expand All @@ -576,8 +576,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 =
(dma_addr_t)((u32) &(llis_bus[num_llis + 1]));
llis_va[num_llis].next = llis_bus + (num_llis + 1) * sizeof(struct pl08x_lli);

if (cctl & PL080_CONTROL_SRC_INCR)
txd->srcbus.addr += len;
Expand Down Expand Up @@ -621,7 +620,6 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
int max_bytes_per_lli;
int total_bytes = 0;
struct pl08x_lli *llis_va;
struct pl08x_lli *llis_bus;

txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT,
&txd->llis_bus);
Expand Down Expand Up @@ -971,8 +969,7 @@ static void pl08x_free_txd(struct pl08x_driver_data *pl08x,
struct pl08x_txd *txd)
{
/* Free the LLI */
dma_pool_free(pl08x->pool, txd->llis_va,
txd->llis_bus);
dma_pool_free(pl08x->pool, txd->llis_va, txd->llis_bus);

pl08x->pool_ctr--;

Expand Down

0 comments on commit 56b6188

Please sign in to comment.