Commit 1938ab0d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: venus: vdec: 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.

As a bonus, there's no need to check if ret == 1, as
pm_runtime_resume_and_get() always return 0 on success.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f6bf35ee

drivers/media/platform/qcom/venus/vdec.c

+3 −3
Original line number Diff line number Diff line
@@ -568,10 +568,10 @@ static int vdec_pm_get(struct venus_inst *inst) 
	int ret;



	mutex_lock(&core->pm_lock);

	ret = pm_runtime_get_sync(dev);

	ret = pm_runtime_resume_and_get(dev);

	mutex_unlock(&core->pm_lock);



	return ret < 0 ? ret : 0;

	return ret;

}



static int vdec_pm_put(struct venus_inst *inst, bool autosuspend)
@@ -601,7 +601,7 @@ static int vdec_pm_get_put(struct venus_inst *inst) 
	mutex_lock(&core->pm_lock);



	if (pm_runtime_suspended(dev)) {

		ret = pm_runtime_get_sync(dev);

		ret = pm_runtime_resume_and_get(dev);

		if (ret < 0)

			goto error;