redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ARM: PL08x: make pl08x_fill_lli_for_desc() return void

Browse source 
We don't need pl08x_fill_lli_for_desc() to return num_llis + 1 as
we know that's what it always does.  We can just pass in num_llis
and use post-increment in the caller.

This makes the code slightly easier to read.

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>
This commit is contained in:
Russell King - ARM Linux 2011-01-03 22:41:54 +00:00 committed by Dan Williams
parent 858c21c0f3
commit 0059005f2c
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/dma/amba-pl08x.c
View file

@ -521,9 +521,8 @@ static void pl08x_choose_master_bus(struct pl08x_bus_data *src_bus,
* Fills in one LLI for a certain transfer descriptor * Fills in one LLI for a certain transfer descriptor
* and advance the counter * and advance the counter
*/ */
static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x, static void pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
struct pl08x_txd *txd, int num_llis, int len, struct pl08x_txd *txd, int num_llis, int len, u32 cctl, u32 *remainder)
u32 cctl, u32 *remainder)
{ {
struct pl08x_lli *llis_va = txd->llis_va; struct pl08x_lli *llis_va = txd->llis_va;
dma_addr_t llis_bus = txd->llis_bus; dma_addr_t llis_bus = txd->llis_bus;
@ -545,8 +544,6 @@ static int pl08x_fill_lli_for_desc(struct pl08x_driver_data *pl08x,
BUG_ON(*remainder < len); BUG_ON(*remainder < len);
*remainder -= len; *remainder -= len;
return num_llis + 1;
} }
/* /*
@ -646,8 +643,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
"less than a bus width (remain 0x%08x)\n", "less than a bus width (remain 0x%08x)\n",
__func__, remainder); __func__, remainder);
cctl = pl08x_cctl_bits(cctl, 1, 1, 1); cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
num_llis = pl08x_fill_lli_for_desc(pl08x, txd, num_llis++, 1,
pl08x_fill_lli_for_desc(pl08x, txd, num_llis, 1,
cctl, &remainder); cctl, &remainder);
total_bytes++; total_bytes++;
} }
@ -662,8 +658,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
"(remain 0x%08x)\n", "(remain 0x%08x)\n",
__func__, remainder); __func__, remainder);
cctl = pl08x_cctl_bits(cctl, 1, 1, 1); cctl = pl08x_cctl_bits(cctl, 1, 1, 1);
num_llis = pl08x_fill_lli_for_desc pl08x_fill_lli_for_desc(pl08x, txd, num_llis++, 1,
(pl08x, txd, num_llis, 1, cctl, &remainder); cctl, &remainder);
total_bytes++; total_bytes++;
} }
@ -787,9 +783,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
dev_vdbg(&pl08x->adev->dev, dev_vdbg(&pl08x->adev->dev,
"%s fill lli with single lli chunk of size 0x%08zx (remainder 0x%08zx)\n", "%s fill lli with single lli chunk of size 0x%08zx (remainder 0x%08zx)\n",
__func__, lli_len, remainder); __func__, lli_len, remainder);
num_llis = pl08x_fill_lli_for_desc(pl08x, txd, pl08x_fill_lli_for_desc(pl08x, txd, num_llis++,
num_llis, lli_len, cctl, lli_len, cctl, &remainder);
&remainder);
total_bytes += lli_len; total_bytes += lli_len;
} }
@ -806,10 +801,9 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
dev_vdbg(&pl08x->adev->dev, dev_vdbg(&pl08x->adev->dev,
"%s align with boundary, single byte (remain 0x%08zx)\n", "%s align with boundary, single byte (remain 0x%08zx)\n",
__func__, remainder); __func__, remainder);
num_llis = pl08x_fill_lli_for_desc(pl08x, txd,
pl08x_fill_lli_for_desc(pl08x, num_llis++, 1, cctl,
txd, num_llis, 1, &remainder);
cctl, &remainder);
total_bytes++; total_bytes++;
} }
} }
@ -823,8 +817,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
dev_vdbg(&pl08x->adev->dev, dev_vdbg(&pl08x->adev->dev,
"%s align with boundary, single odd byte (remain %zu)\n", "%s align with boundary, single odd byte (remain %zu)\n",
__func__, remainder); __func__, remainder);
num_llis = pl08x_fill_lli_for_desc(pl08x, txd, num_llis, pl08x_fill_lli_for_desc(pl08x, txd, num_llis++, 1,
1, cctl, &remainder); cctl, &remainder);
total_bytes++; total_bytes++;
} }
} }