linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sylwester Nawrocki <snawrocki@kernel.org>
To: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: linuxarm@huawei.com, mauro.chehab@huawei.com,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Sylwester Nawrocki <s.nawrocki@samsung.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
	linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH 57/78] media: exynos4-is: use pm_runtime_resume_and_get()
Date: Sun, 25 Apr 2021 22:57:25 +0200	[thread overview]
Message-ID: <45068e81-8f9b-fea8-b7bc-bdd0443ba7e6@kernel.org> (raw)
In-Reply-To: <091915bb1cbec13b566d129f85ae229fcb92e2e4.1619191723.git.mchehab+huawei@kernel.org>

On 24.04.2021 08:45, Mauro Carvalho Chehab wrote:
> 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/exynos4-is/fimc-capture.c   | 6 ++----
>   drivers/media/platform/exynos4-is/fimc-is.c        | 3 ++-
>   drivers/media/platform/exynos4-is/fimc-isp-video.c | 3 +--
>   drivers/media/platform/exynos4-is/fimc-isp.c       | 7 +++----
>   drivers/media/platform/exynos4-is/fimc-lite.c      | 5 +++--
>   drivers/media/platform/exynos4-is/fimc-m2m.c       | 2 +-
>   drivers/media/platform/exynos4-is/media-dev.c      | 8 +++-----
>   drivers/media/platform/exynos4-is/mipi-csis.c      | 5 ++---
>   8 files changed, 17 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
> index 13c838d3f947..0da36443173c 100644
> --- a/drivers/media/platform/exynos4-is/fimc-capture.c
> +++ b/drivers/media/platform/exynos4-is/fimc-capture.c
> @@ -478,11 +478,9 @@ static int fimc_capture_open(struct file *file)
>   		goto unlock;
>   
>   	set_bit(ST_CAPT_BUSY, &fimc->state);
> -	ret = pm_runtime_get_sync(&fimc->pdev->dev);
> -	if (ret < 0) {
> -		pm_runtime_put_sync(&fimc->pdev->dev);
> +	ret = pm_runtime_resume_and_get(&fimc->pdev->dev);
> +	if (ret < 0)
>   		goto unlock;
> -	}
>   
>   	ret = v4l2_fh_open(file);
>   	if (ret) {
> diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
> index 972d9601d236..bca35866cc74 100644
> --- a/drivers/media/platform/exynos4-is/fimc-is.c
> +++ b/drivers/media/platform/exynos4-is/fimc-is.c
> @@ -828,7 +828,7 @@ static int fimc_is_probe(struct platform_device *pdev)
>   			goto err_irq;
>   	}
>   
> -	ret = pm_runtime_get_sync(dev);
> +	ret = pm_runtime_resume_and_get(dev);
>   	if (ret < 0)
>   		goto err_pm;

It seems you intended to use err_suspend label here. We don't need
a new label though, instead of err_pm we can jump to err_irq when
pm_runtime_resume_and_get() fails. Note that when runtime PM is
disabled pm_runtime_resume_and_get() always returns 0.

> @@ -862,6 +862,7 @@ static int fimc_is_probe(struct platform_device *pdev)
>   	fimc_is_unregister_subdevs(is);
>   err_pm:
>   	pm_runtime_put_noidle(dev);
> +err_suspend:
>   	if (!pm_runtime_enabled(dev))
>   		fimc_is_runtime_suspend(dev);
>   err_irq:


> diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
> index 1aac167abb17..a0218237d66b 100644
> --- a/drivers/media/platform/exynos4-is/mipi-csis.c
> +++ b/drivers/media/platform/exynos4-is/mipi-csis.c
> @@ -494,7 +494,7 @@ static int s5pcsis_s_power(struct v4l2_subdev *sd, int on)
>   	struct device *dev = &state->pdev->dev;
>   
>   	if (on)
> -		return pm_runtime_get_sync(dev);
> +		return pm_runtime_resume_and_get(dev);
>   
>   	return pm_runtime_put_sync(dev);
>   }
> @@ -509,9 +509,8 @@ static int s5pcsis_s_stream(struct v4l2_subdev *sd, int enable)
>   
>   	if (enable) {
>   		s5pcsis_clear_counters(state);
> -		ret = pm_runtime_get_sync(&state->pdev->dev);
> +		ret = pm_runtime_resume_and_get(&state->pdev->dev);
>   		if (ret && ret != 1) {
> -			pm_runtime_put_noidle(&state->pdev->dev);
>   			return ret;
>   		}

Braces could be dropped as well here.

>   	}


Thanks,
Sylwester


  reply	other threads:[~2021-04-25 20:57 UTC|newest]

Thread overview: 127+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-24  6:44 [PATCH 00/78] media: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 01/78] media: atmel: properly get pm_runtime Mauro Carvalho Chehab
2021-04-24  9:36   ` kernel test robot
2021-04-24  6:44 ` [PATCH 02/78] media: marvel-ccic: fix some issues when getting pm_runtime Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 03/78] media: mdk-mdp: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 04/78] media: rcar_fdp1: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 05/78] media: mdk-mdp: " Mauro Carvalho Chehab
2021-04-24 18:23   ` Ezequiel Garcia
2021-04-24  6:44 ` [PATCH 06/78] media: renesas-ceu: " Mauro Carvalho Chehab
2021-04-24  8:11   ` Jacopo Mondi
2021-04-24  6:44 ` [PATCH 07/78] media: s5p: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 08/78] media: am437x:: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 09/78] media: sh_vou: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 10/78] media: sti/hva: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 11/78] staging: media: rkvdec: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-24 23:20   ` Ezequiel Garcia
2021-04-24  6:44 ` [PATCH 12/78] staging: media: atomisp_fops: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 13/78] staging: media: hantro_drv: " Mauro Carvalho Chehab
2021-04-24 23:23   ` Ezequiel Garcia
2021-04-26 12:33     ` Mauro Carvalho Chehab
2021-04-26 12:42       ` Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 14/78] staging: media: imx7-mipi-csis: " Mauro Carvalho Chehab
2021-04-26 10:11   ` Rui Miguel Silva
2021-04-24  6:44 ` [PATCH 15/78] staging: media: ipu3: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 16/78] staging: media: cedrus_video: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 17/78] staging: media: vde: " Mauro Carvalho Chehab
2021-04-24  7:35   ` Dmitry Osipenko
2021-04-27  9:22     ` Mauro Carvalho Chehab
2021-04-27 12:34       ` Johan Hovold
2021-04-24  6:44 ` [PATCH 18/78] staging: media: csi: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 19/78] staging: media: vi: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 20/78] media: mtk-vcodec: fix pm_runtime_get_sync() usage count Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 21/78] media: s5p-jpeg: " Mauro Carvalho Chehab
2021-04-27  9:14   ` Sylwester Nawrocki
2021-04-24  6:44 ` [PATCH 22/78] media: delta-v4l2: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 23/78] media: sun8i_rotate: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 24/78] media: i2c: ak7375: use pm_runtime_resume_and_get() Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 25/78] media: i2c: ccs-core: " Mauro Carvalho Chehab
2021-04-25 18:55   ` Sakari Ailus
2021-04-26 14:01     ` Mauro Carvalho Chehab
2021-04-26 14:09       ` Sakari Ailus
2021-04-26 14:16         ` Mauro Carvalho Chehab
2021-04-26 14:29           ` Sakari Ailus
2021-04-26 17:32             ` Mauro Carvalho Chehab
2021-04-27  7:02               ` Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 26/78] media: i2c: dw9714: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 27/78] media: i2c: dw9768: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 28/78] media: i2c: dw9807-vcm: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 29/78] media: i2c: hi556: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 30/78] media: i2c: imx214: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 31/78] media: i2c: imx219: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 32/78] media: i2c: imx258: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 33/78] media: i2c: imx274: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 34/78] media: i2c: imx290: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 35/78] media: i2c: imx319: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 36/78] media: i2c: imx334: " Mauro Carvalho Chehab
2021-04-26  9:06   ` Alessandrelli, Daniele
2021-04-24  6:44 ` [PATCH 37/78] media: i2c: imx355: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 38/78] media: i2c: mt9m001: " Mauro Carvalho Chehab
2021-04-24  8:24   ` Jacopo Mondi
2021-04-24 10:00     ` Johan Hovold
2021-04-26 14:38       ` Mauro Carvalho Chehab
2021-04-27 12:23         ` Johan Hovold
2021-04-28  8:31           ` Mauro Carvalho Chehab
2021-04-28 10:05             ` Johan Hovold
2021-04-28 11:28               ` Mauro Carvalho Chehab
2021-04-28 11:56                 ` Johan Hovold
2021-04-24  6:44 ` [PATCH 39/78] media: i2c: ov02a10: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 40/78] media: i2c: ov13858: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 41/78] media: i2c: ov2659: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 42/78] media: i2c: ov2685: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 43/78] media: i2c: ov2740: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 44/78] media: i2c: ov5647: " Mauro Carvalho Chehab
2021-04-24  8:30   ` Jacopo Mondi
2021-04-24  6:44 ` [PATCH 45/78] media: i2c: ov5648: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 46/78] media: i2c: ov5670: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 47/78] media: i2c: ov5675: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 48/78] media: i2c: ov5695: " Mauro Carvalho Chehab
2021-04-24  6:44 ` [PATCH 49/78] media: i2c: ov7740: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 50/78] media: i2c: ov8856: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 51/78] media: i2c: ov8865: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 52/78] media: i2c: ov9734: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 53/78] media: i2c: tvp5150: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 54/78] media: i2c: video-i2c: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 55/78] media: ipu3: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 56/78] media: coda: " Mauro Carvalho Chehab
2021-04-26  6:53   ` Philipp Zabel
2021-04-24  6:45 ` [PATCH 57/78] media: exynos4-is: " Mauro Carvalho Chehab
2021-04-25 20:57   ` Sylwester Nawrocki [this message]
2021-04-26 13:12     ` Mauro Carvalho Chehab
2021-04-27  8:06       ` Sylwester Nawrocki
2021-04-24  6:45 ` [PATCH 58/78] media: exynos-gsc: " Mauro Carvalho Chehab
2021-04-27  8:18   ` Sylwester Nawrocki
2021-04-27  9:30     ` Mauro Carvalho Chehab
2021-04-27  9:42       ` Mauro Carvalho Chehab
2021-04-27 11:50         ` Sylwester Nawrocki
2021-04-28  7:13           ` Mauro Carvalho Chehab
2021-04-28  7:17             ` Mauro Carvalho Chehab
2021-04-28  8:27               ` Sylwester Nawrocki
2021-04-24  6:45 ` [PATCH 59/78] media: mtk-jpeg: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 60/78] media: camss-csid: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 61/78] media: camss-csiphy: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 62/78] media: camss-ispif: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 63/78] media: camss-vfe: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 64/78] media: core: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 65/78] media: pm_helpers: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 66/78] media: vdec: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 67/78] media: venc: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 68/78] media: rcar-fcp: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 69/78] media: rcar-vin: " Mauro Carvalho Chehab
2021-04-24  8:33   ` Niklas Söderlund
2021-04-24  9:12   ` Geert Uytterhoeven
2021-04-26 13:33     ` Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 70/78] media: rga-buf: " Mauro Carvalho Chehab
2021-04-28 17:09   ` Ezequiel Garcia
2021-04-24  6:45 ` [PATCH 71/78] media: rkisp1-capture: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 72/78] media: s3c-camif: " Mauro Carvalho Chehab
2021-04-25 19:36   ` Sylwester Nawrocki
2021-04-24  6:45 ` [PATCH 73/78] media: s5p-mfc: " Mauro Carvalho Chehab
2021-04-27  9:36   ` Sylwester Nawrocki
2021-04-24  6:45 ` [PATCH 74/78] media: bdisp-v4l2: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 75/78] media: stm32: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 76/78] media: sun4i_v4l2: " Mauro Carvalho Chehab
2021-04-24 10:21   ` kernel test robot
2021-04-24  6:45 ` [PATCH 77/78] media: ti-vpe: " Mauro Carvalho Chehab
2021-04-24  6:45 ` [PATCH 78/78] media: vsp1: " Mauro Carvalho Chehab
2021-04-28 10:13 ` [PATCH 00/78] media: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=45068e81-8f9b-fea8-b7bc-bdd0443ba7e6@kernel.org \
    --to=snawrocki@kernel.org \
    --cc=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=mauro.chehab@huawei.com \
    --cc=mchehab+huawei@kernel.org \
    --cc=mchehab@kernel.org \
    --cc=s.nawrocki@samsung.com \
    --subject='Re: [PATCH 57/78] media: exynos4-is: use pm_runtime_resume_and_get()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).