leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: s3c-camif: use pm_runtime_resume_and_get()

Browse Source 
Commit dd8088d5a8 ("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.

Reviewed-by: Sylwester Nawrocki <snawrocki@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-04-23 17:19:20 +02:00
parent 8102cf89ec
commit a8779c2752
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/s3c-camif/camif-capture.c
View File

@ -547,7 +547,7 @@ static int s3c_camif_open(struct file *file)
if (ret < 0) if (ret < 0)
goto unlock; goto unlock;
ret = pm_runtime_get_sync(camif->dev); ret = pm_runtime_resume_and_get(camif->dev);
if (ret < 0) if (ret < 0)
goto err_pm; goto err_pm;

5
drivers/media/platform/s3c-camif/camif-core.c
View File

@ -460,9 +460,9 @@ static int s3c_camif_probe(struct platform_device *pdev)
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = pm_runtime_get_sync(dev); ret = pm_runtime_resume_and_get(dev);
if (ret < 0) if (ret < 0)
goto err_pm; goto err_disable;
ret = camif_media_dev_init(camif); ret = camif_media_dev_init(camif);
if (ret < 0) if (ret < 0)
@ -502,6 +502,7 @@ err_sens:
camif_unregister_media_entities(camif); camif_unregister_media_entities(camif);
err_pm: err_pm:
pm_runtime_put(dev); pm_runtime_put(dev);
err_disable:
pm_runtime_disable(dev); pm_runtime_disable(dev);
camif_clk_put(camif); camif_clk_put(camif);
err_clk: err_clk: