media: ti-vpe: cal: remove useless IRQ defines

Remove a bunch of IRQ defines, of which only CAL_HL_IRQ_ENABLE and
CAL_HL_IRQ_CLEAR are used, and these defines only end up obfuscating
code.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.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>

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 101efe3..e35565f 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -701,11 +701,11 @@ static void enable_irqs(struct cal_ctx *ctx)
 
        /* Enable IRQ_WDMA_END 0/1 */
        val = 0;
-       set_field(&val, CAL_HL_IRQ_ENABLE, CAL_HL_IRQ_MASK(ctx->csi2_port));
+       set_field(&val, 1, CAL_HL_IRQ_MASK(ctx->csi2_port));
        reg_write(ctx->dev, CAL_HL_IRQENABLE_SET(2), val);
        /* Enable IRQ_WDMA_START 0/1 */
        val = 0;
-       set_field(&val, CAL_HL_IRQ_ENABLE, CAL_HL_IRQ_MASK(ctx->csi2_port));
+       set_field(&val, 1, CAL_HL_IRQ_MASK(ctx->csi2_port));
        reg_write(ctx->dev, CAL_HL_IRQENABLE_SET(3), val);
        /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
        reg_write(ctx->dev, CAL_CSI2_VC_IRQENABLE(1), 0xFF000000);
@@ -723,11 +723,11 @@ static void disable_irqs(struct cal_ctx *ctx)
 
        /* Disable IRQ_WDMA_END 0/1 */
        val = 0;
-       set_field(&val, CAL_HL_IRQ_CLEAR, CAL_HL_IRQ_MASK(ctx->csi2_port));
+       set_field(&val, 1, CAL_HL_IRQ_MASK(ctx->csi2_port));
        reg_write(ctx->dev, CAL_HL_IRQENABLE_CLR(2), val);
        /* Disable IRQ_WDMA_START 0/1 */
        val = 0;
-       set_field(&val, CAL_HL_IRQ_CLEAR, CAL_HL_IRQ_MASK(ctx->csi2_port));
+       set_field(&val, 1, CAL_HL_IRQ_MASK(ctx->csi2_port));
        reg_write(ctx->dev, CAL_HL_IRQENABLE_CLR(3), val);
        /* Todo: Add VC_IRQ and CSI2_COMPLEXIO_IRQ handling */
        reg_write(ctx->dev, CAL_CSI2_VC_IRQENABLE(1), 0);

diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h
index c558455..ac54a2f 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal_regs.h
+++ b/drivers/media/platform/ti-vpe/cal_regs.h
@@ -142,12 +142,6 @@
 #define CAL_HL_IRQ_EOI_LINE_NUMBER_EOI0                        0
 
 #define CAL_HL_IRQ_MASK(m)                     BIT((m) - 1)
-#define CAL_HL_IRQ_NOACTION                            0x0
-#define CAL_HL_IRQ_ENABLE                              0x1
-#define CAL_HL_IRQ_CLEAR                               0x1
-#define CAL_HL_IRQ_DISABLED                            0x0
-#define CAL_HL_IRQ_ENABLED                             0x1
-#define CAL_HL_IRQ_PENDING                             0x1
 
 #define CAL_HL_IRQ_OCPO_ERR_MASK               BIT(6)