lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14, 19/19] media: mtk-vcodec: Remove mtk_vcodec_release_enc_pm
    Date
    There are only two lines in mtk_vcodec_release_enc_pm, using
    pm_runtime_disable and put_device instead directly.

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

    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
    Co-developed-by: Yong Wu <yong.wu@mediatek.com>
    ---
    drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 9 ++++++---
    drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 9 +--------
    drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 3 +--
    3 files changed, 8 insertions(+), 13 deletions(-)

    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    index 0f326d82dea0..7816efb90cbe 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_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>
    @@ -260,7 +261,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
    return PTR_ERR(dev->fw_handler);

    dev->venc_pdata = of_device_get_match_data(&pdev->dev);
    - ret = mtk_vcodec_init_enc_pm(dev);
    + ret = mtk_vcodec_init_enc_clk(dev);
    if (ret < 0) {
    dev_err(&pdev->dev, "Failed to get mtk vcodec clock source!");
    goto err_enc_pm;
    @@ -372,7 +373,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
    err_enc_alloc:
    v4l2_device_unregister(&dev->v4l2_dev);
    err_res:
    - mtk_vcodec_release_enc_pm(dev);
    + pm_runtime_disable(dev->pm.dev);
    + put_device(dev->pm.larbvenc);
    err_enc_pm:
    mtk_vcodec_fw_release(dev->fw_handler);
    return ret;
    @@ -462,7 +464,8 @@ static int mtk_vcodec_enc_remove(struct platform_device *pdev)
    video_unregister_device(dev->vfd_enc);

    v4l2_device_unregister(&dev->v4l2_dev);
    - mtk_vcodec_release_enc_pm(dev);
    + pm_runtime_disable(dev->pm.dev);
    + put_device(dev->pm.larbvenc);
    mtk_vcodec_fw_release(dev->fw_handler);
    return 0;
    }
    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    index 0c8c8f86788c..0825c6ec4eb7 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
    @@ -13,7 +13,7 @@
    #include "mtk_vcodec_enc_pm.h"
    #include "mtk_vcodec_util.h"

    -int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
    +int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkdev)
    {
    struct device_node *node;
    struct platform_device *pdev;
    @@ -86,13 +86,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev)
    return ret;
    }

    -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev)
    -{
    - pm_runtime_disable(mtkdev->pm.dev);
    - put_device(mtkdev->pm.larbvenc);
    -}
    -
    -
    void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
    {
    struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
    diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    index b7ecdfd74823..bc455cefc0cd 100644
    --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
    @@ -9,8 +9,7 @@

    #include "mtk_vcodec_drv.h"

    -int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *dev);
    -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *dev);
    +int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *dev);

    void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm);
    void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm);
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-12-15 07:17    [W:4.634 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site