summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-07-06 20:36:28 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-07-19 10:31:37 +0200
commit7e75b1502f65d70088f522cb4474502644b44428 (patch)
treee49b062346adff40bcefeb677b0e493fbb62d8b9 /drivers/media/platform
parentmedia: ti-vpe: cal: Move CAL_NUM_CSI2_PORTS from cal_regs.h to cal.c (diff)
downloadlinux-7e75b1502f65d70088f522cb4474502644b44428.tar.xz
linux-7e75b1502f65d70088f522cb4474502644b44428.zip
media: ti-vpe: cal: Remove isvcirqset() and isportirqset() macros
The isvcirqset() isn't used. The isportirqset() doesn't increase readability. Inline the latter and simply drop the former. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Benoit Parrot <bparrot@ti.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/ti-vpe/cal.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 67b87d33639d..e57ee6010555 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1265,11 +1265,6 @@ static inline void cal_process_buffer_complete(struct cal_ctx *ctx)
ctx->cur_frm = ctx->next_frm;
}
-#define isvcirqset(irq, vc, ff) (irq & \
- (CAL_CSI2_VC_IRQENABLE_ ##ff ##_IRQ_##vc ##_MASK))
-
-#define isportirqset(irq, port) (irq & CAL_HL_IRQ_MASK(port))
-
static irqreturn_t cal_irq(int irq_cal, void *data)
{
struct cal_dev *cal = data;
@@ -1309,7 +1304,7 @@ static irqreturn_t cal_irq(int irq_cal, void *data)
reg_write(cal, CAL_HL_IRQSTATUS(1), status);
for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) {
- if (isportirqset(status, i)) {
+ if (status & CAL_HL_IRQ_MASK(i)) {
ctx = cal->ctx[i];
spin_lock(&ctx->slock);
@@ -1332,7 +1327,7 @@ static irqreturn_t cal_irq(int irq_cal, void *data)
reg_write(cal, CAL_HL_IRQSTATUS(2), status);
for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) {
- if (isportirqset(status, i)) {
+ if (status & CAL_HL_IRQ_MASK(i)) {
ctx = cal->ctx[i];
dma_q = &ctx->vidq;