[PATCH -next 0/2] Fix PM disable depth imbalance in stm32 probe

[PATCH -next 0/2] Fix PM disable depth imbalance in stm32 probe

[Zhang Qilong]

The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced. We fix it by moving pm_runtime_enable to the
endding of probe.

Zhang Qilong (2):
  ASoC: stm32: dfsdm: Fix PM disable depth imbalance in
    stm32_adfsdm_probe
  ASoC: stm32: spdifrx: Fix PM disable depth imbalance in
    stm32_spdifrx_probe

 sound/soc/stm/stm32_adfsdm.c  | 8 +++++---
 sound/soc/stm/stm32_spdifrx.c | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

-- 
2.25.1

[PATCH -next 1/2] ASoC: stm32: dfsdm: Fix PM disable depth imbalance in stm32_adfsdm_probe

[Zhang Qilong]

The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced according to context. We fix it by moving
pm_runtime_enable to the endding of stm32_adfsdm_probe.

Fixes:98e500a12f934 ("ASoC: stm32: dfsdm: add pm_runtime support for audio")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
 sound/soc/stm/stm32_adfsdm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
index 04f2912e1418..643fc8a17018 100644
--- a/sound/soc/stm/stm32_adfsdm.c
+++ b/sound/soc/stm/stm32_adfsdm.c
@@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
 
 	dev_set_drvdata(&pdev->dev, priv);
 
-	pm_runtime_enable(&pdev->dev);
-
 	ret = devm_snd_soc_register_component(&pdev->dev,
 					      &stm32_adfsdm_dai_component,
 					      &priv->dai_drv, 1);
@@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
 #endif
 
 	ret = snd_soc_add_component(component, NULL, 0);
-	if (ret < 0)
+	if (ret < 0) {
 		dev_err(&pdev->dev, "%s: Failed to register PCM platform\n",
 			__func__);
+		return ret;
+	}
+
+	pm_runtime_enable(&pdev->dev);
 
 	return ret;
 }
-- 
2.25.1

[PATCH -next 2/2] ASoC: stm32: spdifrx: Fix PM disable depth imbalance in stm32_spdifrx_probe

[Zhang Qilong]

The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced according to context. We fix it by moving
pm_runtime_enable to the endding of stm32_spdifrx_probe.

Fixes:ac5e3efd55868 ("ASoC: stm32: spdifrx: add pm_runtime support")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
 sound/soc/stm/stm32_spdifrx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c
index 0f7146756717..d399c906bb92 100644
--- a/sound/soc/stm/stm32_spdifrx.c
+++ b/sound/soc/stm/stm32_spdifrx.c
@@ -1002,8 +1002,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
 	udelay(2);
 	reset_control_deassert(rst);
 
-	pm_runtime_enable(&pdev->dev);
-
 	pcm_config = &stm32_spdifrx_pcm_config;
 	ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);
 	if (ret)
@@ -1036,6 +1034,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
 			FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver));
 	}
 
+	pm_runtime_enable(&pdev->dev);
+
 	return ret;
 
 error:
-- 
2.25.1

Re: [Linux-stm32] [PATCH -next 2/2] ASoC: stm32: spdifrx: Fix PM disable depth imbalance in stm32_spdifrx_probe

[Olivier MOYSAN]

Hi Zhang,

Thanks.You can add my:
Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com>

BRs

On 9/26/22 16:11, Zhang Qilong wrote:
> The pm_runtime_enable will increase power disable depth. Thus
> a pairing decrement is needed on the error handling path to
> keep it balanced according to context. We fix it by moving
> pm_runtime_enable to the endding of stm32_spdifrx_probe.
> 
> Fixes:ac5e3efd55868 ("ASoC: stm32: spdifrx: add pm_runtime support")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> ---
>   sound/soc/stm/stm32_spdifrx.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c
> index 0f7146756717..d399c906bb92 100644
> --- a/sound/soc/stm/stm32_spdifrx.c
> +++ b/sound/soc/stm/stm32_spdifrx.c
> @@ -1002,8 +1002,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
>   	udelay(2);
>   	reset_control_deassert(rst);
>   
> -	pm_runtime_enable(&pdev->dev);
> -
>   	pcm_config = &stm32_spdifrx_pcm_config;
>   	ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);
>   	if (ret)
> @@ -1036,6 +1034,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
>   			FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver));
>   	}
>   
> +	pm_runtime_enable(&pdev->dev);
> +
>   	return ret;
>   
>   error:

Re: [Linux-stm32] [PATCH -next 1/2] ASoC: stm32: dfsdm: Fix PM disable depth imbalance in stm32_adfsdm_probe

[Olivier MOYSAN]

Hi Zhang,

Thanks.You can add my:
Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com>

BRs

On 9/26/22 16:11, Zhang Qilong wrote:
> The pm_runtime_enable will increase power disable depth. Thus
> a pairing decrement is needed on the error handling path to
> keep it balanced according to context. We fix it by moving
> pm_runtime_enable to the endding of stm32_adfsdm_probe.
> 
> Fixes:98e500a12f934 ("ASoC: stm32: dfsdm: add pm_runtime support for audio")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> ---
>   sound/soc/stm/stm32_adfsdm.c | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
> index 04f2912e1418..643fc8a17018 100644
> --- a/sound/soc/stm/stm32_adfsdm.c
> +++ b/sound/soc/stm/stm32_adfsdm.c
> @@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
>   
>   	dev_set_drvdata(&pdev->dev, priv);
>   
> -	pm_runtime_enable(&pdev->dev);
> -
>   	ret = devm_snd_soc_register_component(&pdev->dev,
>   					      &stm32_adfsdm_dai_component,
>   					      &priv->dai_drv, 1);
> @@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev)
>   #endif
>   
>   	ret = snd_soc_add_component(component, NULL, 0);
> -	if (ret < 0)
> +	if (ret < 0) {
>   		dev_err(&pdev->dev, "%s: Failed to register PCM platform\n",
>   			__func__);
> +		return ret;
> +	}
> +
> +	pm_runtime_enable(&pdev->dev);
>   
>   	return ret;
>   }