Commit bb8c9853 authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mtk-vcodec: Remove mtk_vcodec_release_enc_pm 



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.

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent ba31a5b3

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c

+6 −3
Original line number Diff line number Diff line
@@ -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>
@@ -257,7 +258,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;
@@ -369,7 +370,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;
@@ -458,7 +460,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;

}

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c

+1 −8
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h

+1 −2
Original line number Diff line number Diff line
@@ -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);