Message ID | 20241216220628.1018633-1-linux@treblig.org |
---|---|
State | New |
Headers | show |
Series | media: venus: Remove unused hfi_core_ping() | expand |
On 16/12/2024 22:06, linux@treblig.org wrote: > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > hfi_core_ping() was added by 2017's > commit 09c2845e8fe4 ("[media] media: venus: hfi: add Host Firmware > Interface (HFI)") > > but has remained unused. > > Remove it. > > It was the only caller of the ->core_ping member of hfi_ops, > so remove it, and the venus_core_ping that it pointed to. > > Note I've left pky_sys_ping which seems to be the lowest level > definition of the command. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > --- > drivers/media/platform/qcom/venus/hfi.c | 23 ------------------- > drivers/media/platform/qcom/venus/hfi.h | 2 -- > drivers/media/platform/qcom/venus/hfi_venus.c | 11 --------- > 3 files changed, 36 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c > index e00aedb41d16..675e6fd1e9fa 100644 > --- a/drivers/media/platform/qcom/venus/hfi.c > +++ b/drivers/media/platform/qcom/venus/hfi.c > @@ -138,29 +138,6 @@ int hfi_core_trigger_ssr(struct venus_core *core, u32 type) > return core->ops->core_trigger_ssr(core, type); > } > > -int hfi_core_ping(struct venus_core *core) > -{ > - int ret; > - > - mutex_lock(&core->lock); > - > - ret = core->ops->core_ping(core, 0xbeef); > - if (ret) > - goto unlock; > - > - ret = wait_for_completion_timeout(&core->done, TIMEOUT); > - if (!ret) { > - ret = -ETIMEDOUT; > - goto unlock; > - } > - ret = 0; > - if (core->error != HFI_ERR_NONE) > - ret = -ENODEV; > -unlock: > - mutex_unlock(&core->lock); > - return ret; > -} > - > static int wait_session_msg(struct venus_inst *inst) > { > int ret; > diff --git a/drivers/media/platform/qcom/venus/hfi.h b/drivers/media/platform/qcom/venus/hfi.h > index f25d412d6553..0338841d5992 100644 > --- a/drivers/media/platform/qcom/venus/hfi.h > +++ b/drivers/media/platform/qcom/venus/hfi.h > @@ -108,7 +108,6 @@ struct hfi_inst_ops { > struct hfi_ops { > int (*core_init)(struct venus_core *core); > int (*core_deinit)(struct venus_core *core); > - int (*core_ping)(struct venus_core *core, u32 cookie); > int (*core_trigger_ssr)(struct venus_core *core, u32 trigger_type); > > int (*session_init)(struct venus_inst *inst, u32 session_type, > @@ -152,7 +151,6 @@ int hfi_core_deinit(struct venus_core *core, bool blocking); > int hfi_core_suspend(struct venus_core *core); > int hfi_core_resume(struct venus_core *core, bool force); > int hfi_core_trigger_ssr(struct venus_core *core, u32 type); > -int hfi_core_ping(struct venus_core *core); > int hfi_session_create(struct venus_inst *inst, const struct hfi_inst_ops *ops); > void hfi_session_destroy(struct venus_inst *inst); > int hfi_session_init(struct venus_inst *inst, u32 pixfmt); > diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c > index f9437b6412b9..a9167867063c 100644 > --- a/drivers/media/platform/qcom/venus/hfi_venus.c > +++ b/drivers/media/platform/qcom/venus/hfi_venus.c > @@ -1178,16 +1178,6 @@ static int venus_core_deinit(struct venus_core *core) > return 0; > } > > -static int venus_core_ping(struct venus_core *core, u32 cookie) > -{ > - struct venus_hfi_device *hdev = to_hfi_priv(core); > - struct hfi_sys_ping_pkt pkt; > - > - pkt_sys_ping(&pkt, cookie); > - > - return venus_iface_cmdq_write(hdev, &pkt, false); > -} > - > static int venus_core_trigger_ssr(struct venus_core *core, u32 trigger_type) > { > struct venus_hfi_device *hdev = to_hfi_priv(core); > @@ -1639,7 +1629,6 @@ static int venus_suspend(struct venus_core *core) > static const struct hfi_ops venus_hfi_ops = { > .core_init = venus_core_init, > .core_deinit = venus_core_deinit, > - .core_ping = venus_core_ping, > .core_trigger_ssr = venus_core_trigger_ssr, > > .session_init = venus_session_init, Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c index e00aedb41d16..675e6fd1e9fa 100644 --- a/drivers/media/platform/qcom/venus/hfi.c +++ b/drivers/media/platform/qcom/venus/hfi.c @@ -138,29 +138,6 @@ int hfi_core_trigger_ssr(struct venus_core *core, u32 type) return core->ops->core_trigger_ssr(core, type); } -int hfi_core_ping(struct venus_core *core) -{ - int ret; - - mutex_lock(&core->lock); - - ret = core->ops->core_ping(core, 0xbeef); - if (ret) - goto unlock; - - ret = wait_for_completion_timeout(&core->done, TIMEOUT); - if (!ret) { - ret = -ETIMEDOUT; - goto unlock; - } - ret = 0; - if (core->error != HFI_ERR_NONE) - ret = -ENODEV; -unlock: - mutex_unlock(&core->lock); - return ret; -} - static int wait_session_msg(struct venus_inst *inst) { int ret; diff --git a/drivers/media/platform/qcom/venus/hfi.h b/drivers/media/platform/qcom/venus/hfi.h index f25d412d6553..0338841d5992 100644 --- a/drivers/media/platform/qcom/venus/hfi.h +++ b/drivers/media/platform/qcom/venus/hfi.h @@ -108,7 +108,6 @@ struct hfi_inst_ops { struct hfi_ops { int (*core_init)(struct venus_core *core); int (*core_deinit)(struct venus_core *core); - int (*core_ping)(struct venus_core *core, u32 cookie); int (*core_trigger_ssr)(struct venus_core *core, u32 trigger_type); int (*session_init)(struct venus_inst *inst, u32 session_type, @@ -152,7 +151,6 @@ int hfi_core_deinit(struct venus_core *core, bool blocking); int hfi_core_suspend(struct venus_core *core); int hfi_core_resume(struct venus_core *core, bool force); int hfi_core_trigger_ssr(struct venus_core *core, u32 type); -int hfi_core_ping(struct venus_core *core); int hfi_session_create(struct venus_inst *inst, const struct hfi_inst_ops *ops); void hfi_session_destroy(struct venus_inst *inst); int hfi_session_init(struct venus_inst *inst, u32 pixfmt); diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index f9437b6412b9..a9167867063c 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -1178,16 +1178,6 @@ static int venus_core_deinit(struct venus_core *core) return 0; } -static int venus_core_ping(struct venus_core *core, u32 cookie) -{ - struct venus_hfi_device *hdev = to_hfi_priv(core); - struct hfi_sys_ping_pkt pkt; - - pkt_sys_ping(&pkt, cookie); - - return venus_iface_cmdq_write(hdev, &pkt, false); -} - static int venus_core_trigger_ssr(struct venus_core *core, u32 trigger_type) { struct venus_hfi_device *hdev = to_hfi_priv(core); @@ -1639,7 +1629,6 @@ static int venus_suspend(struct venus_core *core) static const struct hfi_ops venus_hfi_ops = { .core_init = venus_core_init, .core_deinit = venus_core_deinit, - .core_ping = venus_core_ping, .core_trigger_ssr = venus_core_trigger_ssr, .session_init = venus_session_init,