| Message ID | 20210509113354.660190-19-jic23@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | IIO: Runtime PM related cleanups. | expand |
On Sun, May 9, 2021 at 4:37 AM Jonathan Cameron <jic23@kernel.org> wrote: > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Found using coccicheck script under review at: > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ > > As pm_runtime_resume_and_get() returns <= 0 take advantage of that to > change the error checking to if (ret) which is more in keeping with the > rest of this driver. > > This is a prequel to taking a closer look at the runtime pm in IIO drivers > in general. > Acked-by: Matt Ranostay <matt.ranostay@konsulko.com> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Matt Ranostay <matt.ranostay@konsulko.com> > --- > drivers/iio/chemical/atlas-sensor.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c > index d10f921b233a..90bb3f5bff19 100644 > --- a/drivers/iio/chemical/atlas-sensor.c > +++ b/drivers/iio/chemical/atlas-sensor.c > @@ -410,11 +410,9 @@ static int atlas_buffer_postenable(struct iio_dev *indio_dev) > struct atlas_data *data = iio_priv(indio_dev); > int ret; > > - ret = pm_runtime_get_sync(&data->client->dev); > - if (ret < 0) { > - pm_runtime_put_noidle(&data->client->dev); > + ret = pm_runtime_resume_and_get(&data->client->dev); > + if (ret) > return ret; > - } > > return atlas_set_interrupt(data, true); > } > @@ -487,11 +485,9 @@ static int atlas_read_measurement(struct atlas_data *data, int reg, __be32 *val) > int suspended = pm_runtime_suspended(dev); > 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) > return ret; > - } > > if (suspended) > msleep(data->chip->delay); > -- > 2.31.1 >
Em Sun, 9 May 2021 12:33:44 +0100 Jonathan Cameron <jic23@kernel.org> escreveu: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Found using coccicheck script under review at: > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ > > As pm_runtime_resume_and_get() returns <= 0 take advantage of that to > change the error checking to if (ret) which is more in keeping with the > rest of this driver. > > 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@huawei.com> > Cc: Matt Ranostay <matt.ranostay@konsulko.com> Same case as patch 17: this driver also seems to have an extra (unbalanced?) call to pm_runtime_disable() at remove(). > --- > drivers/iio/chemical/atlas-sensor.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c > index d10f921b233a..90bb3f5bff19 100644 > --- a/drivers/iio/chemical/atlas-sensor.c > +++ b/drivers/iio/chemical/atlas-sensor.c > @@ -410,11 +410,9 @@ static int atlas_buffer_postenable(struct iio_dev *indio_dev) > struct atlas_data *data = iio_priv(indio_dev); > int ret; > > - ret = pm_runtime_get_sync(&data->client->dev); > - if (ret < 0) { > - pm_runtime_put_noidle(&data->client->dev); > + ret = pm_runtime_resume_and_get(&data->client->dev); > + if (ret) > return ret; > - } > > return atlas_set_interrupt(data, true); > } > @@ -487,11 +485,9 @@ static int atlas_read_measurement(struct atlas_data *data, int reg, __be32 *val) > int suspended = pm_runtime_suspended(dev); > 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) > return ret; > - } > > if (suspended) > msleep(data->chip->delay); Thanks, Mauro
On Wed, 12 May 2021 16:25:41 +0200 Mauro Carvalho Chehab <mchehab@kernel.org> wrote: > Em Sun, 9 May 2021 12:33:44 +0100 > Jonathan Cameron <jic23@kernel.org> escreveu: > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > Found using coccicheck script under review at: > > https://lore.kernel.org/lkml/20210427141946.2478411-1-Julia.Lawall@inria.fr/ > > > > As pm_runtime_resume_and_get() returns <= 0 take advantage of that to > > change the error checking to if (ret) which is more in keeping with the > > rest of this driver. > > > > 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@huawei.com> > > Cc: Matt Ranostay <matt.ranostay@konsulko.com> > > Same case as patch 17: this driver also seems to have an extra > (unbalanced?) call to pm_runtime_disable() at remove(). Good point again. Matt, given this is a material change I'm going to drop your tag, please take another look. Thanks, Jonathan > > > --- > > drivers/iio/chemical/atlas-sensor.c | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c > > index d10f921b233a..90bb3f5bff19 100644 > > --- a/drivers/iio/chemical/atlas-sensor.c > > +++ b/drivers/iio/chemical/atlas-sensor.c > > @@ -410,11 +410,9 @@ static int atlas_buffer_postenable(struct iio_dev *indio_dev) > > struct atlas_data *data = iio_priv(indio_dev); > > int ret; > > > > - ret = pm_runtime_get_sync(&data->client->dev); > > - if (ret < 0) { > > - pm_runtime_put_noidle(&data->client->dev); > > + ret = pm_runtime_resume_and_get(&data->client->dev); > > + if (ret) > > return ret; > > - } > > > > return atlas_set_interrupt(data, true); > > } > > @@ -487,11 +485,9 @@ static int atlas_read_measurement(struct atlas_data *data, int reg, __be32 *val) > > int suspended = pm_runtime_suspended(dev); > > 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) > > return ret; > > - } > > > > if (suspended) > > msleep(data->chip->delay); > > > > Thanks, > Mauro
diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c index d10f921b233a..90bb3f5bff19 100644 --- a/drivers/iio/chemical/atlas-sensor.c +++ b/drivers/iio/chemical/atlas-sensor.c @@ -410,11 +410,9 @@ static int atlas_buffer_postenable(struct iio_dev *indio_dev) struct atlas_data *data = iio_priv(indio_dev); int ret; - ret = pm_runtime_get_sync(&data->client->dev); - if (ret < 0) { - pm_runtime_put_noidle(&data->client->dev); + ret = pm_runtime_resume_and_get(&data->client->dev); + if (ret) return ret; - } return atlas_set_interrupt(data, true); } @@ -487,11 +485,9 @@ static int atlas_read_measurement(struct atlas_data *data, int reg, __be32 *val) int suspended = pm_runtime_suspended(dev); 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) return ret; - } if (suspended) msleep(data->chip->delay);