Commit 7295e537 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: coda: use pm_runtime_resume_and_get() 



Commit dd8088d5 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

While here, as noted by Phillip, the labels at the coda_open()
function are currently named after what operation failed,
instead of what they do in response. So, change the name of
the error label that it is called when clk_enable fails,
in order to be consistent.

Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 0ccb25b8

drivers/media/platform/coda/coda-common.c

+4 −3
Original line number Diff line number Diff line
@@ -2660,7 +2660,7 @@ static int coda_open(struct file *file) 
	ctx->use_vdoa = false;



	/* Power up and upload firmware if necessary */

	ret = pm_runtime_get_sync(dev->dev);

	ret = pm_runtime_resume_and_get(dev->dev);

	if (ret < 0) {

		v4l2_err(&dev->v4l2_dev, "failed to power up: %d\n", ret);

		goto err_pm_get;
@@ -2668,7 +2668,7 @@ static int coda_open(struct file *file) 


	ret = clk_prepare_enable(dev->clk_per);

	if (ret)

		goto err_pm_get;

		goto err_clk_enable;



	ret = clk_prepare_enable(dev->clk_ahb);

	if (ret)
@@ -2707,8 +2707,9 @@ static int coda_open(struct file *file) 
	clk_disable_unprepare(dev->clk_ahb);

err_clk_ahb:

	clk_disable_unprepare(dev->clk_per);

err_pm_get:

err_clk_enable:

	pm_runtime_put_sync(dev->dev);

err_pm_get:

	v4l2_fh_del(&ctx->fh);

	v4l2_fh_exit(&ctx->fh);

err_coda_name_init: