On Wed, 12 May 2021 15:51:39 +0200
Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> wrote:
> Em Sun, 9 May 2021 12:33:38 +0100
> Jonathan Cameron <jic23@xxxxxxxxxx> escreveu:
>
> > From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> >
> > The call to pm_runtime_put_noidle() in remove() is not balanced by a get so
> > drop it.
> >
> > Using pm_runtime_resume_and_get() allows for simple introduction of
> > error handling to allow for runtime resume failing.
> >
> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> > Cc: Mike Looijmans <mike.looijmans@xxxxxxxx>
>
> LGTM.
>
> Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
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
>
> > ---
> > drivers/iio/accel/bmi088-accel-core.c | 26 ++++++++++++++++++++------
> > 1 file changed, 20 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/iio/accel/bmi088-accel-core.c b/drivers/iio/accel/bmi088-accel-core.c
> > index 61aaaf48c040..a06dae5c971d 100644
> > --- a/drivers/iio/accel/bmi088-accel-core.c
> > +++ b/drivers/iio/accel/bmi088-accel-core.c
> > @@ -285,11 +285,17 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev,
> > case IIO_CHAN_INFO_RAW:
> > switch (chan->type) {
> > case IIO_TEMP:
> > - pm_runtime_get_sync(dev);
> > + ret = pm_runtime_resume_and_get(dev);
> > + if (ret)
> > + return ret;
> > +
> > ret = bmi088_accel_get_temp(data, val);
> > goto out_read_raw_pm_put;
> > case IIO_ACCEL:
> > - pm_runtime_get_sync(dev);
> > + ret = pm_runtime_resume_and_get(dev);
> > + if (ret)
> > + return ret;
> > +
> > ret = iio_device_claim_direct_mode(indio_dev);
> > if (ret)
> > goto out_read_raw_pm_put;
> > @@ -319,7 +325,10 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev,
> > *val = BMI088_ACCEL_TEMP_UNIT;
> > return IIO_VAL_INT;
> > case IIO_ACCEL:
> > - pm_runtime_get_sync(dev);
> > + ret = pm_runtime_resume_and_get(dev);
> > + if (ret)
> > + return ret;
> > +
> > ret = regmap_read(data->regmap,
> > BMI088_ACCEL_REG_ACC_RANGE, val);
> > if (ret)
> > @@ -334,7 +343,10 @@ static int bmi088_accel_read_raw(struct iio_dev *indio_dev,
> > return -EINVAL;
> > }
> > case IIO_CHAN_INFO_SAMP_FREQ:
> > - pm_runtime_get_sync(dev);
> > + ret = pm_runtime_resume_and_get(dev);
> > + if (ret)
> > + return ret;
> > +
> > ret = bmi088_accel_get_sample_freq(data, val, val2);
> > goto out_read_raw_pm_put;
> > default:
> > @@ -376,7 +388,10 @@ static int bmi088_accel_write_raw(struct iio_dev *indio_dev,
> >
> > switch (mask) {
> > case IIO_CHAN_INFO_SAMP_FREQ:
> > - pm_runtime_get_sync(dev);
> > + ret = pm_runtime_resume_and_get(dev);
> > + if (ret)
> > + return ret;
> > +
> > ret = bmi088_accel_set_sample_freq(data, val);
> > pm_runtime_mark_last_busy(dev);
> > pm_runtime_put_autosuspend(dev);
> > @@ -530,7 +545,6 @@ int bmi088_accel_core_remove(struct device *dev)
> >
> > pm_runtime_disable(dev);
> > pm_runtime_set_suspended(dev);
> > - pm_runtime_put_noidle(dev);
> > bmi088_accel_power_down(data);
> >
> > return 0;
>
>
>
> Thanks,
> Mauro
