| Message ID | 20210509113354.660190-7-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:32 +0100 Jonathan Cameron <jic23@kernel.org> escreveu: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Both these drivers call pm_runtime_put_no_idle() when the reference > count should already be zero as there is no matching get() > > Whilst here use pm_runtime_resume_and_get() rather than open coding. LGTM. Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/iio/accel/mma9551.c | 1 - > drivers/iio/accel/mma9551_core.c | 4 +--- > drivers/iio/accel/mma9553.c | 1 - > 3 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c > index 08a2303cc9df..4c359fb05480 100644 > --- a/drivers/iio/accel/mma9551.c > +++ b/drivers/iio/accel/mma9551.c > @@ -515,7 +515,6 @@ static int mma9551_remove(struct i2c_client *client) > > pm_runtime_disable(&client->dev); > pm_runtime_set_suspended(&client->dev); > - pm_runtime_put_noidle(&client->dev); > > mutex_lock(&data->mutex); > mma9551_set_device_state(data->client, false); > diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c > index 666e7a04a7d7..fbf2e2c45678 100644 > --- a/drivers/iio/accel/mma9551_core.c > +++ b/drivers/iio/accel/mma9551_core.c > @@ -664,7 +664,7 @@ int mma9551_set_power_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); > @@ -673,8 +673,6 @@ int mma9551_set_power_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; > } > diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c > index c15908faa381..ba3ecb3b57dc 100644 > --- a/drivers/iio/accel/mma9553.c > +++ b/drivers/iio/accel/mma9553.c > @@ -1154,7 +1154,6 @@ static int mma9553_remove(struct i2c_client *client) > > pm_runtime_disable(&client->dev); > pm_runtime_set_suspended(&client->dev); > - pm_runtime_put_noidle(&client->dev); > > mutex_lock(&data->mutex); > mma9551_set_device_state(data->client, false); Thanks, Mauro
On Wed, 12 May 2021 15:37:57 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > Em Sun, 9 May 2021 12:33:32 +0100 > Jonathan Cameron <jic23@kernel.org> escreveu: > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > Both these drivers call pm_runtime_put_no_idle() when the reference > > count should already be zero as there is no matching get() > > > > Whilst here use pm_runtime_resume_and_get() rather than open coding. > > LGTM. > > Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Applied. Thanks, > > --- > > drivers/iio/accel/mma9551.c | 1 - > > drivers/iio/accel/mma9551_core.c | 4 +--- > > drivers/iio/accel/mma9553.c | 1 - > > 3 files changed, 1 insertion(+), 5 deletions(-) > > > > diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c > > index 08a2303cc9df..4c359fb05480 100644 > > --- a/drivers/iio/accel/mma9551.c > > +++ b/drivers/iio/accel/mma9551.c > > @@ -515,7 +515,6 @@ static int mma9551_remove(struct i2c_client *client) > > > > pm_runtime_disable(&client->dev); > > pm_runtime_set_suspended(&client->dev); > > - pm_runtime_put_noidle(&client->dev); > > > > mutex_lock(&data->mutex); > > mma9551_set_device_state(data->client, false); > > diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c > > index 666e7a04a7d7..fbf2e2c45678 100644 > > --- a/drivers/iio/accel/mma9551_core.c > > +++ b/drivers/iio/accel/mma9551_core.c > > @@ -664,7 +664,7 @@ int mma9551_set_power_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); > > @@ -673,8 +673,6 @@ int mma9551_set_power_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; > > } > > diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c > > index c15908faa381..ba3ecb3b57dc 100644 > > --- a/drivers/iio/accel/mma9553.c > > +++ b/drivers/iio/accel/mma9553.c > > @@ -1154,7 +1154,6 @@ static int mma9553_remove(struct i2c_client *client) > > > > pm_runtime_disable(&client->dev); > > pm_runtime_set_suspended(&client->dev); > > - pm_runtime_put_noidle(&client->dev); > > > > mutex_lock(&data->mutex); > > mma9551_set_device_state(data->client, false); > > > > Thanks, > Mauro
diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 08a2303cc9df..4c359fb05480 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -515,7 +515,6 @@ static int mma9551_remove(struct i2c_client *client) pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); mutex_lock(&data->mutex); mma9551_set_device_state(data->client, false); diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c index 666e7a04a7d7..fbf2e2c45678 100644 --- a/drivers/iio/accel/mma9551_core.c +++ b/drivers/iio/accel/mma9551_core.c @@ -664,7 +664,7 @@ int mma9551_set_power_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); @@ -673,8 +673,6 @@ int mma9551_set_power_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; } diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c index c15908faa381..ba3ecb3b57dc 100644 --- a/drivers/iio/accel/mma9553.c +++ b/drivers/iio/accel/mma9553.c @@ -1154,7 +1154,6 @@ static int mma9553_remove(struct i2c_client *client) pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev); - pm_runtime_put_noidle(&client->dev); mutex_lock(&data->mutex); mma9551_set_device_state(data->client, false);