From c155f9df51db63d52cad53d52a48235fb50866b4 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Mon, 3 Jan 2011 22:34:27 +0000 Subject: [PATCH] --- yaml --- r: 231577 b: refs/heads/master c: ad0a3ad33c96cbba98ba62116771fb836c551e60 h: refs/heads/master i: 231575: 5c069e82558a9f188111ed0f31577531843173bc v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/[refs] b/[refs] index edb921ef198f..660dd4ac683e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 730404ac1c47403af67420705980c99e90bf182f +refs/heads/master: ad0a3ad33c96cbba98ba62116771fb836c551e60 diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c index d22d6280242d..b721ed2e884d 100644 --- a/trunk/drivers/dma/amba-pl08x.c +++ b/trunk/drivers/dma/amba-pl08x.c @@ -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) { @@ -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); @@ -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) { @@ -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