| Message ID | 20210509113354.660190-6-jic23@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | IIO: Runtime PM related cleanups. | expand |
Em Sun, 9 May 2021 12:33:31 +0100 Jonathan Cameron <jic23@kernel.org> escreveu: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Remove() callback calls pm_runtime_put_noidle() but there it is not > balancing a get. No actual affect because the runtime pm core prevents > the reference count going negative. > > Whilst here use pm_runtime_resume_and_get() rather than open coded version. > Again, coccinelle script missed this one due to more complex code > structure. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Sean Nyekjaer <sean@geanix.com> LGTM. Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > drivers/iio/accel/mma8452.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 464a6bfe6746..715b8138fb71 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -221,7 +221,7 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) > int ret; > > if (on) { > - ret = pm_runtime_get_sync(&client->dev); > + ret = pm_runtime_resume_and_get(&client->dev); > } else { > pm_runtime_mark_last_busy(&client->dev); > ret = pm_runtime_put_autosuspend(&client->dev); > @@ -230,8 +230,6 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) > if (ret < 0) { > dev_err(&client->dev, > "failed to change power state to %d\n", on); > - if (on) > - pm_runtime_put_noidle(&client->dev); > > return ret; > } > @@ -1711,7 +1709,6 @@ static int mma8452_remove(struct i2c_client *client) > > pm_runtime_disable(&client->dev); > pm_runtime_set_suspended(&client->dev); > - pm_runtime_put_noidle(&client->dev); > > iio_triggered_buffer_cleanup(indio_dev); > mma8452_trigger_cleanup(indio_dev); Thanks, Mauro
On Wed, 12 May 2021 15:37:10 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > Em Sun, 9 May 2021 12:33:31 +0100 > Jonathan Cameron <jic23@kernel.org> escreveu: > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > Remove() callback calls pm_runtime_put_noidle() but there it is not > > balancing a get. No actual affect because the runtime pm core prevents > > the reference count going negative. > > > > Whilst here use pm_runtime_resume_and_get() rather than open coded version. > > Again, coccinelle script missed this one due to more complex code > > structure. > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Cc: Sean Nyekjaer <sean@geanix.com> > > LGTM. > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Note additional reviews / tags are find for now as I'm happy to rebase this tree as needed until it goes out as togreg (when I try not to!) Thanks, Jonathan > > > --- > > drivers/iio/accel/mma8452.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > > index 464a6bfe6746..715b8138fb71 100644 > > --- a/drivers/iio/accel/mma8452.c > > +++ b/drivers/iio/accel/mma8452.c > > @@ -221,7 +221,7 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) > > int ret; > > > > if (on) { > > - ret = pm_runtime_get_sync(&client->dev); > > + ret = pm_runtime_resume_and_get(&client->dev); > > } else { > > pm_runtime_mark_last_busy(&client->dev); > > ret = pm_runtime_put_autosuspend(&client->dev); > > @@ -230,8 +230,6 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) > > if (ret < 0) { > > dev_err(&client->dev, > > "failed to change power state to %d\n", on); > > - if (on) > > - pm_runtime_put_noidle(&client->dev); > > > > return ret; > > } > > @@ -1711,7 +1709,6 @@ static int mma8452_remove(struct i2c_client *client) > > > > pm_runtime_disable(&client->dev); > > pm_runtime_set_suspended(&client->dev); > > - pm_runtime_put_noidle(&client->dev); > > > > iio_triggered_buffer_cleanup(indio_dev); > > mma8452_trigger_cleanup(indio_dev); > > > > Thanks, > Mauro
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 464a6bfe6746..715b8138fb71 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -221,7 +221,7 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) int ret; if (on) { - ret = pm_runtime_get_sync(&client->dev); + ret = pm_runtime_resume_and_get(&client->dev); } else { pm_runtime_mark_last_busy(&client->dev); ret = pm_runtime_put_autosuspend(&client->dev); @@ -230,8 +230,6 @@ static int mma8452_set_runtime_pm_state(struct i2c_client *client, bool on) if (ret < 0) { dev_err(&client->dev, "failed to change power state to %d\n", on); - if (on) - pm_runtime_put_noidle(&client->dev); return ret; } @@ -1711,7 +1709,6 @@ static int mma8452_remove(struct i2c_client *client) pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); iio_triggered_buffer_cleanup(indio_dev); mma8452_trigger_cleanup(indio_dev);