media: mtk-vcodec: Remove mtk_vcodec_release_dec_pm

There are only two lines in mtk_vcodec_release_dec_pm, using
pm_runtime_disable and put_device instead directly.

Move pm_runtime_enable outside mtk_vcodec_init_dec_pm to symmetry with
pm_runtime_disable, after that, rename mtk_vcodec_init_dec_pm to *_clk
since it only has clock operations now.

Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
index 08d8e02559c6cd441e91256598b154a8c8b70827..86b639d82be815c4dfbe535989f5c2123fe10181 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of.h>
+#include <linux/pm_runtime.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-mem2mem.h>
 #include <media/videobuf2-dma-contig.h>
@@ -128,12 +129,13 @@ static int mtk_vcodec_init_dec_resources(struct mtk_vcodec_dev *dev)
                return ret;
        }
 
-       ret = mtk_vcodec_init_dec_pm(pdev, &dev->pm);
+       ret = mtk_vcodec_init_dec_clk(pdev, &dev->pm);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to get mt vcodec clock source");
                return ret;
        }
 
+       pm_runtime_enable(&pdev->dev);
        return 0;
 }
 
@@ -447,7 +449,8 @@ err_core_workq:
        if (IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch))
                destroy_workqueue(dev->core_workqueue);
 err_res:
-       mtk_vcodec_release_dec_pm(&dev->pm);
+       pm_runtime_disable(dev->pm.dev);
+       put_device(dev->pm.larbvdec);
 err_dec_pm:
        mtk_vcodec_fw_release(dev->fw_handler);
        return ret;
@@ -490,7 +493,8 @@ static int mtk_vcodec_dec_remove(struct platform_device *pdev)
                video_unregister_device(dev->vfd_dec);
 
        v4l2_device_unregister(&dev->v4l2_dev);
-       mtk_vcodec_release_dec_pm(&dev->pm);
+       pm_runtime_disable(dev->pm.dev);
+       put_device(dev->pm.larbvdec);
        mtk_vcodec_fw_release(dev->fw_handler);
        return 0;
 }

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
index f2f5d8869c70eb0c361f0b0059312fa89714ed77..7b5da3e4cac241b21834d1f51c8996508efeb14e 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
@@ -9,6 +9,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
 #include "mtk_vcodec_drv.h"
@@ -140,9 +141,10 @@ static int mtk_vdec_hw_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        subdev_dev->plat_dev = pdev;
-       ret = mtk_vcodec_init_dec_pm(pdev, &subdev_dev->pm);
+       ret = mtk_vcodec_init_dec_clk(pdev, &subdev_dev->pm);
        if (ret)
                return ret;
+       pm_runtime_enable(&pdev->dev);
 
        of_id = of_match_device(mtk_vdec_hw_match, dev);
        if (!of_id) {
@@ -181,7 +183,8 @@ static int mtk_vdec_hw_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, subdev_dev);
        return 0;
 err:
-       mtk_vcodec_release_dec_pm(&subdev_dev->pm);
+       pm_runtime_disable(subdev_dev->pm.dev);
+       put_device(subdev_dev->pm.larbvdec);
        return ret;
 }
 

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
index f5b1e1aab301d3f0cc696c2d2bac10ed471c9ed9..44035a50e3356f08985df6f02b314feea35c6f50 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
@@ -15,7 +15,7 @@
 #include "mtk_vcodec_dec_pm.h"
 #include "mtk_vcodec_util.h"
 
-int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm)
+int mtk_vcodec_init_dec_clk(struct platform_device *pdev, struct mtk_vcodec_pm *pm)
 {
        struct device_node *node;
        struct platform_device *larb_pdev;
@@ -72,20 +72,12 @@ int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *p
                }
        }
 
-       pm_runtime_enable(&pdev->dev);
        return 0;
 put_device:
        put_device(pm->larbvdec);
        return ret;
 }
-EXPORT_SYMBOL_GPL(mtk_vcodec_init_dec_pm);
-
-void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm)
-{
-       pm_runtime_disable(pm->dev);
-       put_device(pm->larbvdec);
-}
-EXPORT_SYMBOL_GPL(mtk_vcodec_release_dec_pm);
+EXPORT_SYMBOL_GPL(mtk_vcodec_init_dec_clk);
 
 int mtk_vcodec_dec_pw_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx)
 {

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
index ff979d384f4c386f4b022a12086006edbb0a458e..3cc721bbfaf6dd64e172fdcfe8df2a127c588919 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
@@ -9,8 +9,7 @@
 
 #include "mtk_vcodec_drv.h"
 
-int mtk_vcodec_init_dec_pm(struct platform_device *pdev, struct mtk_vcodec_pm *pm);
-void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm);
+int mtk_vcodec_init_dec_clk(struct platform_device *pdev, struct mtk_vcodec_pm *pm);
 
 int mtk_vcodec_dec_pw_on(struct mtk_vcodec_dev *vdec_dev, int hw_idx);
 void mtk_vcodec_dec_pw_off(struct mtk_vcodec_dev *vdec_dev, int hw_idx);