| Message ID | 20210509113354.660190-27-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:52 +0100 Jonathan Cameron <jic23@kernel.org> escreveu: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Using this new call makes it easy to handle any errors as a result > of runtime resume as it exits without leaving the reference count > elevated. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > index c685f10b5ae4..ca8dc5cc209a 100644 > --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > @@ -154,7 +154,9 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg) > int tries = 10; > int ret; > > - pm_runtime_get_sync(&client->dev); > + ret = pm_runtime_resume_and_get(&client->dev); > + if (ret < 0) > + return ret; > > /* start sample */ > ret = lidar_write_control(data, LIDAR_REG_CONTROL_ACQUIRE); There's a return just after this that it is missing a call to pm_runtime_put_autosuspend(): if (ret < 0) { dev_err(&client->dev, "cannot send start measurement command"); return ret; } Perhaps the best here would be to add a goto and a label before the return logic. Thanks, Mauro
On Wed, 12 May 2021 16:56:57 +0200 Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > Em Sun, 9 May 2021 12:33:52 +0100 > Jonathan Cameron <jic23@kernel.org> escreveu: > > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > Using this new call makes it easy to handle any errors as a result > > of runtime resume as it exits without leaving the reference count > > elevated. > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > --- > > drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > > index c685f10b5ae4..ca8dc5cc209a 100644 > > --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > > +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c > > @@ -154,7 +154,9 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg) > > int tries = 10; > > int ret; > > > > - pm_runtime_get_sync(&client->dev); > > + ret = pm_runtime_resume_and_get(&client->dev); > > + if (ret < 0) > > + return ret; > > > > /* start sample */ > > ret = lidar_write_control(data, LIDAR_REG_CONTROL_ACQUIRE); > > There's a return just after this that it is missing a call to > pm_runtime_put_autosuspend(): > > if (ret < 0) { > dev_err(&client->dev, "cannot send start measurement command"); > return ret; > } > > Perhaps the best here would be to add a goto and a label before > the return logic. Agreed. I've added a precursor fix patch that does exactly that. > > > Thanks, > Mauro
diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c index c685f10b5ae4..ca8dc5cc209a 100644 --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c @@ -154,7 +154,9 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg) int tries = 10; int ret; - pm_runtime_get_sync(&client->dev); + ret = pm_runtime_resume_and_get(&client->dev); + if (ret < 0) + return ret; /* start sample */ ret = lidar_write_control(data, LIDAR_REG_CONTROL_ACQUIRE);