iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: PL08x: remove unnecessary NULL and BUG checks

Browse Source 
The tasklet always is initialized with a non-NULL data argument.  It
is not possible for it to be called with a NULL data argument (unless
something is very wrong in the tasklet code - in which case lots of
stuff will break).  Therefore, as plchan can never be NULL, remove
this unnecessary BUG check.

In pl08x_tasklet(), we've already dereferenced plchan->at, so it can't
be NULL here.  Remove this unnecessary BUG check.

pl08x_fill_llis_for_desc() and pl08x_free_txd() are always called with
a non-NULL txd argument - either as a consequence of the code paths or
as a result of other checks already in place.  We don't need to repeat
the non-NULL check in these functions.

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:34:27 +00:00 committed by Dan Williams
parent 730404ac1c
commit ad0a3ad33c
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/dma/amba-pl08x.c
View File

@ -623,11 +623,6 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
struct lli *llis_va; struct lli *llis_va;
struct lli *llis_bus; 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_va = dma_pool_alloc(pl08x->pool, GFP_NOWAIT,
&txd->llis_bus); &txd->llis_bus);
if (!txd->llis_va) { if (!txd->llis_va) {
@ -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, static void pl08x_free_txd(struct pl08x_driver_data *pl08x,
struct pl08x_txd *txd) struct pl08x_txd *txd)
{ {
if (!txd)
dev_err(&pl08x->adev->dev,
"%s no descriptor to free\n",
__func__);
/* Free the LLI */ /* Free the LLI */
dma_pool_free(pl08x->pool, txd->llis_va, dma_pool_free(pl08x->pool, txd->llis_va,
txd->llis_bus); txd->llis_bus);
@ -1633,9 +1623,6 @@ static void pl08x_tasklet(unsigned long data)
struct pl08x_driver_data *pl08x = plchan->host; struct pl08x_driver_data *pl08x = plchan->host;
unsigned long flags; unsigned long flags;
if (!plchan)
BUG();
spin_lock_irqsave(&plchan->lock, flags); spin_lock_irqsave(&plchan->lock, flags);
if (plchan->at) { if (plchan->at) {
@ -1655,14 +1642,6 @@ static void pl08x_tasklet(unsigned long data)
if (callback) if (callback)
callback(callback_param); 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 * Free the descriptor if it's not for a device
* using a circular buffer * using a circular buffer