diff mbox series

[75/78] media: stm32: use pm_runtime_resume_and_get()

Message ID	c3fdab46e373c69bdc88edb0efffce61cae06929.1619191723.git.mchehab+huawei@kernel.org
State	Superseded
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Alexandre Torgue <alexandre.torgue@st.com>, Hugues Fruchet <hugues.fruchet@st.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 75/78] media: stm32: use pm_runtime_resume_and_get() Date: Sat, 24 Apr 2021 08:45:25 +0200 Message-Id: <c3fdab46e373c69bdc88edb0efffce61cae06929.1619191723.git.mchehab+huawei@kernel.org> In-Reply-To: <cover.1619191723.git.mchehab+huawei@kernel.org> References: <cover.1619191723.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab <mchehab@kernel.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk
Series	[01/78] media: atmel: properly get pm_runtime \| expand [01/78] media: atmel: properly get pm_runtime [04/78] media: rcar_fdp1: fix pm_runtime_get_sync() usage count [05/78] media: mdk-mdp: fix pm_runtime_get_sync() usage count [06/78] media: renesas-ceu: fix pm_runtime_get_sync() usage count [09/78] media: sh_vou: fix pm_runtime_get_sync() usage count [10/78] media: sti/hva: use pm_runtime_resume_and_get() [12/78] staging: media: atomisp_fops: use pm_runtime_resume_and_get() [15/78] staging: media: ipu3: use pm_runtime_resume_and_get() [18/78] staging: media: csi: use pm_runtime_resume_and_get() [20/78] media: mtk-vcodec: fix pm_runtime_get_sync() usage count [23/78] media: sun8i_rotate: fix pm_runtime_get_sync() usage count [26/78] media: i2c: dw9714: use pm_runtime_resume_and_get() [27/78] media: i2c: dw9768: use pm_runtime_resume_and_get() [29/78] media: i2c: hi556: use pm_runtime_resume_and_get() [30/78] media: i2c: imx214: use pm_runtime_resume_and_get() [33/78] media: i2c: imx274: use pm_runtime_resume_and_get() [34/78] media: i2c: imx290: use pm_runtime_resume_and_get() [39/78] media: i2c: ov02a10: use pm_runtime_resume_and_get() [41/78] media: i2c: ov2659: use pm_runtime_resume_and_get() [42/78] media: i2c: ov2685: use pm_runtime_resume_and_get() [43/78] media: i2c: ov2740: use pm_runtime_resume_and_get() [44/78] media: i2c: ov5647: use pm_runtime_resume_and_get() [49/78] media: i2c: ov7740: use pm_runtime_resume_and_get() [50/78] media: i2c: ov8856: use pm_runtime_resume_and_get() [56/78] media: coda: use pm_runtime_resume_and_get() [57/78] media: exynos4-is: use pm_runtime_resume_and_get() [59/78] media: mtk-jpeg: use pm_runtime_resume_and_get() [60/78] media: camss-csid: use pm_runtime_resume_and_get() [61/78] media: camss-csiphy: use pm_runtime_resume_and_get() [62/78] media: camss-ispif: use pm_runtime_resume_and_get() [63/78] media: camss-vfe: use pm_runtime_resume_and_get() [64/78] media: core: use pm_runtime_resume_and_get() [68/78] media: rcar-fcp: use pm_runtime_resume_and_get() [70/78] media: rga-buf: use pm_runtime_resume_and_get() [71/78] media: rkisp1-capture: use pm_runtime_resume_and_get() [72/78] media: s3c-camif: use pm_runtime_resume_and_get() [75/78] media: stm32: use pm_runtime_resume_and_get() [77/78] media: ti-vpe: use pm_runtime_resume_and_get() [78/78] media: vsp1: use pm_runtime_resume_and_get()

Commit Message

Mauro Carvalho Chehab April 24, 2021, 6:45 a.m. UTC

Commit dd8088d5a896 ("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.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 drivers/media/platform/stm32/stm32-dcmi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
index bbcc2254fa2e..5f4e1db8cfcd 100644
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
@@ -723,11 +723,11 @@  static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)
 	u32 val = 0;
 	int ret;
 
-	ret = pm_runtime_get_sync(dcmi->dev);
+	ret = pm_runtime_resume_and_get(dcmi->dev);
 	if (ret < 0) {
 		dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync (%d)\n",
 			__func__, ret);
-		goto err_pm_put;
+		goto err_unlock;
 	}
 
 	ret = media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline);
@@ -848,6 +848,7 @@  static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)
 
 err_pm_put:
 	pm_runtime_put(dcmi->dev);
+err_unlock:
 	spin_lock_irq(&dcmi->irqlock);
 	/*
 	 * Return all buffers to vb2 in QUEUED state.