| Message ID | 20250117114540.289248-3-claudiu.beznea.uj@bp.renesas.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | iio: rzg2l_adc: Cleanups for rzg2l_adc driver | expand |
On Fri, 17 Jan 2025 at 12:45, Claudiu <claudiu.beznea@tuxon.dev> wrote: > > From: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> > > 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") > Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > > 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 4742a727a80c..99cb73347b18 100644 > --- a/drivers/iio/adc/rzg2l_adc.c > +++ b/drivers/iio/adc/rzg2l_adc.c > @@ -89,7 +89,6 @@ struct rzg2l_adc { > struct mutex lock; > int irq; > u16 last_val[RZG2L_ADC_MAX_CHANNELS]; > - bool was_rpm_active; > }; > > /** > @@ -580,14 +579,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) > @@ -596,9 +590,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; > } > > @@ -616,11 +608,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) > @@ -629,10 +619,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; > -- > 2.43.0 >
diff --git a/drivers/iio/adc/rzg2l_adc.c b/drivers/iio/adc/rzg2l_adc.c index 4742a727a80c..99cb73347b18 100644 --- a/drivers/iio/adc/rzg2l_adc.c +++ b/drivers/iio/adc/rzg2l_adc.c @@ -89,7 +89,6 @@ struct rzg2l_adc { struct mutex lock; int irq; u16 last_val[RZG2L_ADC_MAX_CHANNELS]; - bool was_rpm_active; }; /** @@ -580,14 +579,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) @@ -596,9 +590,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; } @@ -616,11 +608,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) @@ -629,10 +619,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;