Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231577
b: refs/heads/master
c: ad0a3ad
h: refs/heads/master
i:
  231575: 5c069e8
v: v3
  • Loading branch information
Russell King - ARM Linux authored and Dan Williams committed Jan 5, 2011
1 parent 6a1766b commit c155f9d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 730404ac1c47403af67420705980c99e90bf182f
refs/heads/master: ad0a3ad33c96cbba98ba62116771fb836c551e60
21 changes: 0 additions & 21 deletions trunk/drivers/dma/amba-pl08x.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,6 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
struct lli *llis_va;
struct lli *llis_bus;

if (!txd) {
dev_err(&pl08x->adev->dev, "%s no descriptor\n", __func__);
return 0;
}

txd->llis_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT,
&txd->llis_bus);
if (!txd->llis_va) {
Expand Down Expand Up @@ -993,11 +988,6 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
static void pl08x_free_txd(struct pl08x_driver_data *pl08x,
struct pl08x_txd *txd)
{
if (!txd)
dev_err(&pl08x->adev->dev,
"%s no descriptor to free\n",
__func__);

/* Free the LLI */
dma_pool_free(pl08x->pool, txd->llis_va,
txd->llis_bus);
Expand Down Expand Up @@ -1633,9 +1623,6 @@ static void pl08x_tasklet(unsigned long data)
struct pl08x_driver_data *pl08x = plchan->host;
unsigned long flags;

if (!plchan)
BUG();

spin_lock_irqsave(&plchan->lock, flags);

if (plchan->at) {
Expand All @@ -1655,14 +1642,6 @@ static void pl08x_tasklet(unsigned long data)
if (callback)
callback(callback_param);

/*
* Device callbacks should NOT clear
* the current transaction on the channel
* Linus: sometimes they should?
*/
if (!plchan->at)
BUG();

/*
* Free the descriptor if it's not for a device
* using a circular buffer
Expand Down

0 comments on commit c155f9d

Please sign in to comment.