diff mbox series

[v4,77/79] media: rcar-vin: use pm_runtime_resume_and_get()

Message ID c0c8f8b07af20c354b946819f5dcdf9f5129654e.1619621413.git.mchehab+huawei@kernel.org
State Superseded
Headers show
Series Address some issues with PM runtime at media subsystem | expand

Commit Message

Mauro Carvalho Chehab April 28, 2021, 2:52 p.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.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 drivers/media/platform/rcar-vin/rcar-csi2.c | 15 ++++++++++++---
 drivers/media/platform/rcar-vin/rcar-dma.c  |  6 ++----
 drivers/media/platform/rcar-vin/rcar-v4l2.c |  6 ++----
 3 files changed, 16 insertions(+), 11 deletions(-)

Comments

Jonathan Cameron April 30, 2021, 6:05 p.m. UTC | #1
On Wed, 28 Apr 2021 16:52:38 +0200
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> 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.

> 

> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

Trivial thing inline.  Doesn't matter though if you prefer it as is.

> ---

>  drivers/media/platform/rcar-vin/rcar-csi2.c | 15 ++++++++++++---

>  drivers/media/platform/rcar-vin/rcar-dma.c  |  6 ++----

>  drivers/media/platform/rcar-vin/rcar-v4l2.c |  6 ++----

>  3 files changed, 16 insertions(+), 11 deletions(-)

> 

> diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c

> index e06cd512aba2..436fb17f73ea 100644

> --- a/drivers/media/platform/rcar-vin/rcar-csi2.c

> +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c

> @@ -406,10 +406,17 @@ static void rcsi2_enter_standby(struct rcar_csi2 *priv)

>  	pm_runtime_put(priv->dev);

>  }

>  

> -static void rcsi2_exit_standby(struct rcar_csi2 *priv)

> +static int rcsi2_exit_standby(struct rcar_csi2 *priv)

>  {

> -	pm_runtime_get_sync(priv->dev);

> +	int ret;

> +

> +	ret = pm_runtime_resume_and_get(priv->dev);

> +	if (ret < 0)

> +		return ret;

> +

>  	reset_control_deassert(priv->rstc);

> +

> +	return ret;


Maybe return 0; to make it easy to see this returns <= 0;
ret will always be 0 here anyway.

>  }

>  

>  static int rcsi2_wait_phy_start(struct rcar_csi2 *priv,

> @@ -657,7 +664,9 @@ static int rcsi2_start(struct rcar_csi2 *priv)

>  {

>  	int ret;

>  

> -	rcsi2_exit_standby(priv);

> +	ret = rcsi2_exit_standby(priv);

> +	if (ret < 0)

> +		return ret;

>  

>  	ret = rcsi2_start_receiver(priv);

>  	if (ret) {

> diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c

> index f30dafbdf61c..f5f722ab1d4e 100644

> --- a/drivers/media/platform/rcar-vin/rcar-dma.c

> +++ b/drivers/media/platform/rcar-vin/rcar-dma.c

> @@ -1458,11 +1458,9 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)

>  	u32 vnmc;

>  	int ret;

>  

> -	ret = pm_runtime_get_sync(vin->dev);

> -	if (ret < 0) {

> -		pm_runtime_put_noidle(vin->dev);

> +	ret = pm_runtime_resume_and_get(vin->dev);

> +	if (ret < 0)

>  		return ret;

> -	}

>  

>  	/* Make register writes take effect immediately. */

>  	vnmc = rvin_read(vin, VNMC_REG);

> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c

> index 457a65bf6b66..b1e9f86caa5c 100644

> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c

> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c

> @@ -870,11 +870,9 @@ static int rvin_open(struct file *file)

>  	struct rvin_dev *vin = video_drvdata(file);

>  	int ret;

>  

> -	ret = pm_runtime_get_sync(vin->dev);

> -	if (ret < 0) {

> -		pm_runtime_put_noidle(vin->dev);

> +	ret = pm_runtime_resume_and_get(vin->dev);

> +	if (ret < 0)

>  		return ret;

> -	}

>  

>  	ret = mutex_lock_interruptible(&vin->lock);

>  	if (ret)
diff mbox series

Patch

diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
index e06cd512aba2..436fb17f73ea 100644
--- a/drivers/media/platform/rcar-vin/rcar-csi2.c
+++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
@@ -406,10 +406,17 @@  static void rcsi2_enter_standby(struct rcar_csi2 *priv)
 	pm_runtime_put(priv->dev);
 }
 
-static void rcsi2_exit_standby(struct rcar_csi2 *priv)
+static int rcsi2_exit_standby(struct rcar_csi2 *priv)
 {
-	pm_runtime_get_sync(priv->dev);
+	int ret;
+
+	ret = pm_runtime_resume_and_get(priv->dev);
+	if (ret < 0)
+		return ret;
+
 	reset_control_deassert(priv->rstc);
+
+	return ret;
 }
 
 static int rcsi2_wait_phy_start(struct rcar_csi2 *priv,
@@ -657,7 +664,9 @@  static int rcsi2_start(struct rcar_csi2 *priv)
 {
 	int ret;
 
-	rcsi2_exit_standby(priv);
+	ret = rcsi2_exit_standby(priv);
+	if (ret < 0)
+		return ret;
 
 	ret = rcsi2_start_receiver(priv);
 	if (ret) {
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index f30dafbdf61c..f5f722ab1d4e 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -1458,11 +1458,9 @@  int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)
 	u32 vnmc;
 	int ret;
 
-	ret = pm_runtime_get_sync(vin->dev);
-	if (ret < 0) {
-		pm_runtime_put_noidle(vin->dev);
+	ret = pm_runtime_resume_and_get(vin->dev);
+	if (ret < 0)
 		return ret;
-	}
 
 	/* Make register writes take effect immediately. */
 	vnmc = rvin_read(vin, VNMC_REG);
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 457a65bf6b66..b1e9f86caa5c 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -870,11 +870,9 @@  static int rvin_open(struct file *file)
 	struct rvin_dev *vin = video_drvdata(file);
 	int ret;
 
-	ret = pm_runtime_get_sync(vin->dev);
-	if (ret < 0) {
-		pm_runtime_put_noidle(vin->dev);
+	ret = pm_runtime_resume_and_get(vin->dev);
+	if (ret < 0)
 		return ret;
-	}
 
 	ret = mutex_lock_interruptible(&vin->lock);
 	if (ret)