Skip to content

Commit

Permalink
media: cedrus: Get rid of interrupt bottom-half
Browse files Browse the repository at this point in the history
Now that the mem2mem framework guarantees that .device_run
won't be called from interrupt context, it is safe to call
v4l2_m2m_job_finish directly in the top-half.

So this means the bottom-half is no longer needed and we
can get rid of it.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  • Loading branch information
Ezequiel Garcia authored and Mauro Carvalho Chehab committed Nov 23, 2018
1 parent cbd9463 commit 949f29f
Showing 1 changed file with 5 additions and 21 deletions.
26 changes: 5 additions & 21 deletions drivers/staging/media/sunxi/cedrus/cedrus_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,6 @@ void cedrus_dst_format_set(struct cedrus_dev *dev,
}
}

static irqreturn_t cedrus_bh(int irq, void *data)
{
struct cedrus_dev *dev = data;
struct cedrus_ctx *ctx;

ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);
if (!ctx) {
v4l2_err(&dev->v4l2_dev,
"Instance released before the end of transaction\n");
return IRQ_HANDLED;
}

v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);

return IRQ_HANDLED;
}

static irqreturn_t cedrus_irq(int irq, void *data)
{
struct cedrus_dev *dev = data;
Expand Down Expand Up @@ -165,7 +148,9 @@ static irqreturn_t cedrus_irq(int irq, void *data)

spin_unlock_irqrestore(&dev->irq_lock, flags);

return IRQ_WAKE_THREAD;
v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);

return IRQ_HANDLED;
}

int cedrus_hw_probe(struct cedrus_dev *dev)
Expand All @@ -187,9 +172,8 @@ int cedrus_hw_probe(struct cedrus_dev *dev)

return irq_dec;
}
ret = devm_request_threaded_irq(dev->dev, irq_dec, cedrus_irq,
cedrus_bh, 0, dev_name(dev->dev),
dev);
ret = devm_request_irq(dev->dev, irq_dec, cedrus_irq,
0, dev_name(dev->dev), dev);
if (ret) {
v4l2_err(&dev->v4l2_dev, "Failed to request IRQ\n");

Expand Down

0 comments on commit 949f29f

Please sign in to comment.