Skip to content

Commit

Permalink
dmaengine: nbpfaxi: convert to tasklet
Browse files Browse the repository at this point in the history
It is common among dmaengine drivers to use a tasklet for bottom half
interrupt processing. Convert nbpfaxi to do the same.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Guennadi Liakhovetski authored and Vinod Koul committed Aug 4, 2014
1 parent 67b1668 commit f02323e
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions drivers/dma/nbpfaxi.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ struct nbpf_desc_page {
*/
struct nbpf_channel {
struct dma_chan dma_chan;
struct tasklet_struct tasklet;
void __iomem *base;
struct nbpf_device *nbpf;
char name[16];
Expand Down Expand Up @@ -1111,9 +1112,9 @@ static struct dma_chan *nbpf_of_xlate(struct of_phandle_args *dma_spec,
return dchan;
}

static irqreturn_t nbpf_chan_irqt(int irq, void *dev)
static void nbpf_chan_tasklet(unsigned long data)
{
struct nbpf_channel *chan = dev;
struct nbpf_channel *chan = (struct nbpf_channel *)data;
struct nbpf_desc *desc, *tmp;
dma_async_tx_callback callback;
void *param;
Expand Down Expand Up @@ -1176,8 +1177,6 @@ static irqreturn_t nbpf_chan_irqt(int irq, void *dev)
if (must_put)
nbpf_desc_put(desc);
}

return IRQ_HANDLED;
}

static irqreturn_t nbpf_chan_irq(int irq, void *dev)
Expand All @@ -1186,6 +1185,7 @@ static irqreturn_t nbpf_chan_irq(int irq, void *dev)
bool done = nbpf_status_get(chan);
struct nbpf_desc *desc;
irqreturn_t ret;
bool bh = false;

if (!done)
return IRQ_NONE;
Expand All @@ -1200,7 +1200,8 @@ static irqreturn_t nbpf_chan_irq(int irq, void *dev)
ret = IRQ_NONE;
goto unlock;
} else {
ret = IRQ_WAKE_THREAD;
ret = IRQ_HANDLED;
bh = true;
}

list_move_tail(&desc->node, &chan->done);
Expand All @@ -1216,6 +1217,9 @@ static irqreturn_t nbpf_chan_irq(int irq, void *dev)
unlock:
spin_unlock(&chan->lock);

if (bh)
tasklet_schedule(&chan->tasklet);

return ret;
}

Expand Down Expand Up @@ -1258,8 +1262,9 @@ static int nbpf_chan_probe(struct nbpf_device *nbpf, int n)

snprintf(chan->name, sizeof(chan->name), "nbpf %d", n);

ret = devm_request_threaded_irq(dma_dev->dev, chan->irq,
nbpf_chan_irq, nbpf_chan_irqt, IRQF_SHARED,
tasklet_init(&chan->tasklet, nbpf_chan_tasklet, (unsigned long)chan);
ret = devm_request_irq(dma_dev->dev, chan->irq,
nbpf_chan_irq, IRQF_SHARED,
chan->name, chan);
if (ret < 0)
return ret;
Expand Down

0 comments on commit f02323e

Please sign in to comment.