On Sun, 10 Aug 2025 15:33:27 +0300
Claudiu <claudiu.beznea@xxxxxxxxx> wrote:
> From: Claudiu Beznea <claudiu.beznea.uj@xxxxxxxxxxxxxx>
>
> There is no need to manually track the runtime PM status in the driver.
> The pm_runtime_force_suspend() and pm_runtime_force_resume() functions
> already call pm_runtime_status_suspended() to check the runtime PM state.
>
> Additionally, avoid calling pm_runtime_put_autosuspend() during the
> suspend/resume path, as this would decrease the usage counter of a
> potential user that had the ADC open before the suspend/resume cycle.
>
> Fixes: cb164d7c1526 ("iio: adc: rzg2l_adc: Add suspend/resume support")
That SHA isn't upstream. I think it should be.
563cf94f9329
With that fixes up, applied these to the fixes-togreg branch of iio.git and
marked them for stable.
> Reviewed-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@xxxxxxxxxxxxxx>
> ---
>
> Changes in v5:
> - none
>
> Changes in v4:
> - collected tags
>
> Changes in v3:
> - collected tags
>
> Changes in v2:
> - none
>
> drivers/iio/adc/rzg2l_adc.c | 29 ++++++++---------------------
> 1 file changed, 8 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c
> index 9674d48074c9..0cb5a67fd497 100644
> --- a/drivers/iio/adc/rzg2l_adc.c
> +++ b/drivers/iio/adc/rzg2l_adc.c
> @@ -89,7 +89,6 @@ struct rzg2l_adc {
> struct completion completion;
> struct mutex lock;
> u16 last_val[RZG2L_ADC_MAX_CHANNELS];
> - bool was_rpm_active;
> };
>
> /**
> @@ -541,14 +540,9 @@ static int rzg2l_adc_suspend(struct device *dev)
> };
> int ret;
>
> - if (pm_runtime_suspended(dev)) {
> - adc->was_rpm_active = false;
> - } else {
> - ret = pm_runtime_force_suspend(dev);
> - if (ret)
> - return ret;
> - adc->was_rpm_active = true;
> - }
> + ret = pm_runtime_force_suspend(dev);
> + if (ret)
> + return ret;
>
> ret = reset_control_bulk_assert(ARRAY_SIZE(resets), resets);
> if (ret)
> @@ -557,9 +551,7 @@ static int rzg2l_adc_suspend(struct device *dev)
> return 0;
>
> rpm_restore:
> - if (adc->was_rpm_active)
> - pm_runtime_force_resume(dev);
> -
> + pm_runtime_force_resume(dev);
> return ret;
> }
>
> @@ -577,11 +569,9 @@ static int rzg2l_adc_resume(struct device *dev)
> if (ret)
> return ret;
>
> - if (adc->was_rpm_active) {
> - ret = pm_runtime_force_resume(dev);
> - if (ret)
> - goto resets_restore;
> - }
> + ret = pm_runtime_force_resume(dev);
> + if (ret)
> + goto resets_restore;
>
> ret = rzg2l_adc_hw_init(dev, adc);
> if (ret)
> @@ -590,10 +580,7 @@ static int rzg2l_adc_resume(struct device *dev)
> return 0;
>
> rpm_restore:
> - if (adc->was_rpm_active) {
> - pm_runtime_mark_last_busy(dev);
> - pm_runtime_put_autosuspend(dev);
> - }
> + pm_runtime_force_suspend(dev);
> resets_restore:
> reset_control_bulk_assert(ARRAY_SIZE(resets), resets);
> return ret;
