Commit a8779c27 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: s3c-camif: 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.

Reviewed-by: default avatarSylwester Nawrocki <snawrocki@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8102cf89

drivers/media/platform/s3c-camif/camif-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int s3c_camif_open(struct file *file) 
	if (ret < 0)

		goto unlock;



	ret = pm_runtime_get_sync(camif->dev);

	ret = pm_runtime_resume_and_get(camif->dev);

	if (ret < 0)

		goto err_pm;

drivers/media/platform/s3c-camif/camif-core.c

+3 −2
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ static int s3c_camif_probe(struct platform_device *pdev) 


	pm_runtime_enable(dev);



	ret = pm_runtime_get_sync(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		goto err_pm;

		goto err_disable;



	ret = camif_media_dev_init(camif);

	if (ret < 0)
@@ -502,6 +502,7 @@ static int s3c_camif_probe(struct platform_device *pdev) 
	camif_unregister_media_entities(camif);

err_pm:

	pm_runtime_put(dev);

err_disable:

	pm_runtime_disable(dev);

	camif_clk_put(camif);

err_clk: