[v2,10/19] media: ti-vpe: cal: remove useless IRQ defines
Commit Message
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>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/media/platform/ti-vpe/cal.c | 8 ++++----
drivers/media/platform/ti-vpe/cal_regs.h | 6 ------
2 files changed, 4 insertions(+), 10 deletions(-)
Comments
Tomi,
Thanks for the patch.
On 3/19/20 2:50 AM, Tomi Valkeinen wrote:
> 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>
> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
> ---
> drivers/media/platform/ti-vpe/cal.c | 8 ++++----
> drivers/media/platform/ti-vpe/cal_regs.h | 6 ------
> 2 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 53072afbaf4e..979f9027a232 100644
> --- 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 3b3150aaf343..6a235abc25b1 100644
> --- 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)
>
>
@@ -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);
@@ -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)