From b52b9fd3c1d95c6b6e5fc262326551063a45a948 Mon Sep 17 00:00:00 2001 From: Stanimir Varbanov Date: Wed, 8 Jun 2022 04:58:56 -0700 Subject: [PATCH] video-driver: Drop init_interrupt op The init_interrupt op is not used out of variant, lets remove the op and used the functions directly. Change-Id: I8f97cf503503b7f30e824843a5bd9d93c702241a Signed-off-by: Stanimir Varbanov --- driver/variant/iris2/src/msm_vidc_iris2.c | 3 +-- driver/variant/iris3/src/msm_vidc_iris3.c | 3 +-- driver/vidc/inc/msm_vidc_core.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/driver/variant/iris2/src/msm_vidc_iris2.c b/driver/variant/iris2/src/msm_vidc_iris2.c index 324d61f89f..cb3235f289 100644 --- a/driver/variant/iris2/src/msm_vidc_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_iris2.c @@ -732,7 +732,7 @@ static int __power_on_iris2(struct msm_vidc_core *core) */ __set_registers(core); - call_venus_op(core, interrupt_init, core); + __interrupt_init_iris2(core); core->intr_status = 0; enable_irq(core->dt->irq); @@ -1183,7 +1183,6 @@ exit: static struct msm_vidc_venus_ops iris2_ops = { .boot_firmware = __boot_firmware_iris2, - .interrupt_init = __interrupt_init_iris2, .raise_interrupt = __raise_interrupt_iris2, .clear_interrupt = __clear_interrupt_iris2, .clock_config_on_enable = NULL, diff --git a/driver/variant/iris3/src/msm_vidc_iris3.c b/driver/variant/iris3/src/msm_vidc_iris3.c index 3f62cb3394..9c4f6b029f 100644 --- a/driver/variant/iris3/src/msm_vidc_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_iris3.c @@ -776,7 +776,7 @@ static int __power_on_iris3(struct msm_vidc_core *core) */ __set_registers(core); - call_venus_op(core, interrupt_init, core); + __interrupt_init_iris3(core); core->intr_status = 0; enable_irq(core->dt->irq); @@ -1261,7 +1261,6 @@ adjust: static struct msm_vidc_venus_ops iris3_ops = { .boot_firmware = __boot_firmware_iris3, - .interrupt_init = __interrupt_init_iris3, .raise_interrupt = __raise_interrupt_iris3, .clear_interrupt = __clear_interrupt_iris3, .clock_config_on_enable = NULL, diff --git a/driver/vidc/inc/msm_vidc_core.h b/driver/vidc/inc/msm_vidc_core.h index 9f24108753..d5753042b3 100644 --- a/driver/vidc/inc/msm_vidc_core.h +++ b/driver/vidc/inc/msm_vidc_core.h @@ -23,7 +23,6 @@ struct msm_vidc_venus_ops { int (*boot_firmware)(struct msm_vidc_core *core); int (*reset_ahb2axi_bridge)(struct msm_vidc_core *core); int (*clock_config_on_enable)(struct msm_vidc_core *core); - int (*interrupt_init)(struct msm_vidc_core *core); int (*raise_interrupt)(struct msm_vidc_core *core); int (*clear_interrupt)(struct msm_vidc_core *core); int (*prepare_pc)(struct msm_vidc_core *core);