media: meson: vdec: hevc: Refactor vdec_hevc_start and vdec_hevc_stop

Make a new function __vdec_hevc_start(), that does all the
initialization, except the clock initialization for G12A and SM1.

Factor out all the stop logic, except the clk_disable_unprepare(), to a
new function __vdec_hevc_stop. This allows vdec_hevc_start() to
explicitly celan-out the clock during the error-path.

The following smatch warnings are fixed:

drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'core->vdec_hevc_clk' from clk_prepare_enable() not released on lines: 227.
drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'core->vdec_hevcf_clk' from clk_prepare_enable() not released on lines: 227.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/meson/vdec/vdec_hevc.c b/drivers/staging/media/meson/vdec/vdec_hevc.c
index afced435c9070240885970a82c40280b4c6fc6f5..1939c47def58d9316cd355a4ede44b1f3a6173bd 100644 (file)
--- a/drivers/staging/media/meson/vdec/vdec_hevc.c
+++ b/drivers/staging/media/meson/vdec/vdec_hevc.c
@@ -110,7 +110,7 @@ static u32 vdec_hevc_vififo_level(struct amvdec_session *sess)
        return readl_relaxed(sess->core->dos_base + HEVC_STREAM_LEVEL);
 }
 
-static int vdec_hevc_stop(struct amvdec_session *sess)
+static void __vdec_hevc_stop(struct amvdec_session *sess)
 {
        struct amvdec_core *core = sess->core;
        struct amvdec_codec_ops *codec_ops = sess->fmt_out->codec_ops;
@@ -142,6 +142,13 @@ static int vdec_hevc_stop(struct amvdec_session *sess)
        else
                regmap_update_bits(core->regmap_ao, AO_RTI_GEN_PWR_SLEEP0,
                                   GEN_PWR_VDEC_HEVC, GEN_PWR_VDEC_HEVC);
+}
+
+static int vdec_hevc_stop(struct amvdec_session *sess)
+{
+       struct amvdec_core *core = sess->core;
+
+       __vdec_hevc_stop(sess);
 
        clk_disable_unprepare(core->vdec_hevc_clk);
        if (core->platform->revision == VDEC_REVISION_G12A ||
@@ -151,20 +158,12 @@ static int vdec_hevc_stop(struct amvdec_session *sess)
        return 0;
 }
 
-static int vdec_hevc_start(struct amvdec_session *sess)
+static int __vdec_hevc_start(struct amvdec_session *sess)
 {
        int ret;
        struct amvdec_core *core = sess->core;
        struct amvdec_codec_ops *codec_ops = sess->fmt_out->codec_ops;
 
-       if (core->platform->revision == VDEC_REVISION_G12A ||
-           core->platform->revision == VDEC_REVISION_SM1) {
-               clk_set_rate(core->vdec_hevcf_clk, 666666666);
-               ret = clk_prepare_enable(core->vdec_hevcf_clk);
-               if (ret)
-                       return ret;
-       }
-
        clk_set_rate(core->vdec_hevc_clk, 666666666);
        ret = clk_prepare_enable(core->vdec_hevc_clk);
        if (ret) {
@@ -223,10 +222,32 @@ static int vdec_hevc_start(struct amvdec_session *sess)
        return 0;
 
 stop:
-       vdec_hevc_stop(sess);
+       __vdec_hevc_stop(sess);
+       clk_disable_unprepare(core->vdec_hevc_clk);
        return ret;
 }
 
+static int vdec_hevc_start(struct amvdec_session *sess)
+{
+       struct amvdec_core *core = sess->core;
+       int ret;
+
+       if (core->platform->revision == VDEC_REVISION_G12A ||
+           core->platform->revision == VDEC_REVISION_SM1) {
+               clk_set_rate(core->vdec_hevcf_clk, 666666666);
+               ret = clk_prepare_enable(core->vdec_hevcf_clk);
+               if (ret)
+                       return ret;
+
+               ret = __vdec_hevc_start(sess);
+               if (ret)
+                       clk_disable_unprepare(core->vdec_hevcf_clk);
+               return ret;
+       }
+
+       return __vdec_hevc_start(sess);
+}
+
 struct amvdec_ops vdec_hevc_ops = {
        .start = vdec_hevc_start,
        .stop = vdec_hevc_stop,