On Wed, 12 May 2021 15:30:14 +0200 Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx> wrote: > On 5/9/21 1:33 PM, Jonathan Cameron wrote: > > From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > > > Found using coccicheck script under review at: > > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@xxxxxxxx/ > > > > This is a prequel to taking a closer look at the runtime pm in IIO drivers > > in general. > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > Cc: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx> > > --- > > drivers/iio/adc/stm32-adc.c | 24 ++++++++---------------- > > 1 file changed, 8 insertions(+), 16 deletions(-) > > Hi Jonathan, > > Reviewed-by: Fabrice Gasnier <fabrice.gasnier@xxxxxxxxxxx> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to see if they can find anything we missed. Thanks, Jonathan > > Thanks for the patch, > Regards, > Fabrice > > > > > diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c > > index c9d36c88ee6a..5088de835bb1 100644 > > --- a/drivers/iio/adc/stm32-adc.c > > +++ b/drivers/iio/adc/stm32-adc.c > > @@ -1158,11 +1158,9 @@ static int stm32_adc_single_conv(struct iio_dev *indio_dev, > > > > adc->bufi = 0; > > > > - ret = pm_runtime_get_sync(dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(dev); > > + ret = pm_runtime_resume_and_get(dev); > > + if (ret < 0) > > return ret; > > - } > > > > /* Apply sampling time settings */ > > stm32_adc_writel(adc, regs->smpr[0], adc->smpr_val[0]); > > @@ -1364,11 +1362,9 @@ static int stm32_adc_update_scan_mode(struct iio_dev *indio_dev, > > struct device *dev = indio_dev->dev.parent; > > int ret; > > > > - ret = pm_runtime_get_sync(dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(dev); > > + ret = pm_runtime_resume_and_get(dev); > > + if (ret < 0) > > return ret; > > - } > > > > adc->num_conv = bitmap_weight(scan_mask, indio_dev->masklength); > > > > @@ -1413,11 +1409,9 @@ static int stm32_adc_debugfs_reg_access(struct iio_dev *indio_dev, > > struct device *dev = indio_dev->dev.parent; > > int ret; > > > > - ret = pm_runtime_get_sync(dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(dev); > > + ret = pm_runtime_resume_and_get(dev); > > + if (ret < 0) > > return ret; > > - } > > > > if (!readval) > > stm32_adc_writel(adc, reg, writeval); > > @@ -1537,11 +1531,9 @@ static int stm32_adc_buffer_postenable(struct iio_dev *indio_dev) > > struct device *dev = indio_dev->dev.parent; > > int ret; > > > > - ret = pm_runtime_get_sync(dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(dev); > > + ret = pm_runtime_resume_and_get(dev); > > + if (ret < 0) > > return ret; > > - } > > > > ret = stm32_adc_set_trig(indio_dev, indio_dev->trig); > > if (ret) { > >
