* [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe
@ 2022-01-05 12:56 Miaoqian Lin
2022-01-05 13:07 ` Jonathan Cameron
2022-01-05 13:54 ` Andy Shevchenko
0 siblings, 2 replies; 7+ messages in thread
From: Miaoqian Lin @ 2022-01-05 12:56 UTC (permalink / raw)
Cc: linmq006, Jonathan Cameron, Lars-Peter Clausen, Andy Shevchenko,
Linus Walleij, Alexandru Ardelean, Stephan Gerhold,
Gwendal Grignou, Adriana Reus, linux-iio, linux-kernel
The pm_runtime_enable will increase power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable(). In the PM Runtime docs:
Drivers in ->remove() callback should undo the runtime PM changes done
in ->probe(). Usually this means calling pm_runtime_disable(),
pm_runtime_dont_use_autosuspend() etc.
We should do this in error handling.
Fixes: 7d0ead5 ("iio: Reconcile operation order between iio_register/unregister and pm functions")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/iio/gyro/bmg160_core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index 17b939a367ad..81a6d09788bd 100644
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -1188,11 +1188,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
ret = iio_device_register(indio_dev);
if (ret < 0) {
dev_err(dev, "unable to register iio device\n");
- goto err_buffer_cleanup;
+ goto err_pm_cleanup;
}
return 0;
+err_pm_cleanup:
+ pm_runtime_dont_use_autosuspend(dev);
+ pm_runtime_disable(dev);
err_buffer_cleanup:
iio_triggered_buffer_cleanup(indio_dev);
err_trigger_unregister:
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe 2022-01-05 12:56 [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe Miaoqian Lin @ 2022-01-05 13:07 ` Jonathan Cameron 2022-01-05 13:52 ` Andy Shevchenko 2022-01-05 13:54 ` Andy Shevchenko 1 sibling, 1 reply; 7+ messages in thread From: Jonathan Cameron @ 2022-01-05 13:07 UTC (permalink / raw) To: Miaoqian Lin Cc: Jonathan Cameron, Lars-Peter Clausen, Andy Shevchenko, Linus Walleij, Alexandru Ardelean, Stephan Gerhold, Gwendal Grignou, Adriana Reus, linux-iio, linux-kernel On Wed, 5 Jan 2022 12:56:30 +0000 Miaoqian Lin <linmq006@gmail.com> wrote: > The pm_runtime_enable will increase power disable depth. > If the probe fails, we should use pm_runtime_disable() to balance > pm_runtime_enable(). In the PM Runtime docs: > Drivers in ->remove() callback should undo the runtime PM changes done > in ->probe(). Usually this means calling pm_runtime_disable(), > pm_runtime_dont_use_autosuspend() etc. > We should do this in error handling. > > Fixes: 7d0ead5 ("iio: Reconcile operation order between iio_register/unregister and pm functions") Hi Miaoqian, Please check this fixes tag against the format it should have. Thanks, Jonathan > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > drivers/iio/gyro/bmg160_core.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c > index 17b939a367ad..81a6d09788bd 100644 > --- a/drivers/iio/gyro/bmg160_core.c > +++ b/drivers/iio/gyro/bmg160_core.c > @@ -1188,11 +1188,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(dev, "unable to register iio device\n"); > - goto err_buffer_cleanup; > + goto err_pm_cleanup; > } > > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > err_buffer_cleanup: > iio_triggered_buffer_cleanup(indio_dev); > err_trigger_unregister: ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe 2022-01-05 13:07 ` Jonathan Cameron @ 2022-01-05 13:52 ` Andy Shevchenko 0 siblings, 0 replies; 7+ messages in thread From: Andy Shevchenko @ 2022-01-05 13:52 UTC (permalink / raw) To: Jonathan Cameron Cc: Miaoqian Lin, Jonathan Cameron, Lars-Peter Clausen, Linus Walleij, Alexandru Ardelean, Stephan Gerhold, Gwendal Grignou, Adriana Reus, linux-iio, linux-kernel On Wed, Jan 05, 2022 at 01:07:43PM +0000, Jonathan Cameron wrote: > On Wed, 5 Jan 2022 12:56:30 +0000 > Miaoqian Lin <linmq006@gmail.com> wrote: > > > The pm_runtime_enable will increase power disable depth. > > If the probe fails, we should use pm_runtime_disable() to balance > > pm_runtime_enable(). In the PM Runtime docs: > > Drivers in ->remove() callback should undo the runtime PM changes done > > in ->probe(). Usually this means calling pm_runtime_disable(), > > pm_runtime_dont_use_autosuspend() etc. > > We should do this in error handling. > > > > Fixes: 7d0ead5 ("iio: Reconcile operation order between iio_register/unregister and pm functions") > > Hi Miaoqian, > > Please check this fixes tag against the format it should have. I usually advise people to put the following in the ~/.gitconfig: [core] abbrev = 12 [alias] one = show -s --pretty='format:%h (\"%s\")' c = show -s --pretty='format:https://git.kernel.org/torvalds/c/%h' `git one ...` will give a right thing. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe 2022-01-05 12:56 [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe Miaoqian Lin 2022-01-05 13:07 ` Jonathan Cameron @ 2022-01-05 13:54 ` Andy Shevchenko 2022-01-06 11:23 ` [PATCH v2] iio: Fix error handling for PM Miaoqian Lin 1 sibling, 1 reply; 7+ messages in thread From: Andy Shevchenko @ 2022-01-05 13:54 UTC (permalink / raw) To: Miaoqian Lin Cc: Jonathan Cameron, Lars-Peter Clausen, Linus Walleij, Alexandru Ardelean, Stephan Gerhold, Gwendal Grignou, Adriana Reus, linux-iio, linux-kernel On Wed, Jan 05, 2022 at 12:56:30PM +0000, Miaoqian Lin wrote: > The pm_runtime_enable will increase power disable depth. > If the probe fails, we should use pm_runtime_disable() to balance > pm_runtime_enable(). In the PM Runtime docs: > Drivers in ->remove() callback should undo the runtime PM changes done > in ->probe(). Usually this means calling pm_runtime_disable(), > pm_runtime_dont_use_autosuspend() etc. > We should do this in error handling. Looking into culprit commit, can you fix all of them, please? -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] iio: Fix error handling for PM 2022-01-05 13:54 ` Andy Shevchenko @ 2022-01-06 11:23 ` Miaoqian Lin 2022-01-07 11:59 ` Andy Shevchenko 0 siblings, 1 reply; 7+ messages in thread From: Miaoqian Lin @ 2022-01-06 11:23 UTC (permalink / raw) To: andriy.shevchenko Cc: adi.reus, ardeleanalex, gwendal, jic23, lars, linmq006, linus.walleij, linux-iio, linux-kernel, stephan The pm_runtime_enable will increase power disable depth. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). In the PM Runtime docs: Drivers in ->remove() callback should undo the runtime PM changes done in ->probe(). Usually this means calling pm_runtime_disable(), pm_runtime_dont_use_autosuspend() etc. We should do this in error handling. Fix this problem for the following drivers: bmc150, bmg160, kmx61, kxcj-1013, mma9551, mma9553. Fixes: 7d0ead5c3f00 ("iio: Reconcile operation order between iio_register/unregister and pm functions") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> --- Changes in v2: - fix the fixes tag - fix similar problems introduced by the same commit --- drivers/iio/accel/bmc150-accel-core.c | 5 ++++- drivers/iio/accel/kxcjk-1013.c | 5 ++++- drivers/iio/accel/mma9551.c | 5 ++++- drivers/iio/accel/mma9553.c | 5 ++++- drivers/iio/gyro/bmg160_core.c | 5 ++++- drivers/iio/imu/kmx61.c | 5 ++++- drivers/iio/magnetometer/bmc150_magn.c | 5 +++-- 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c index b0678c351e82..c3a2b4c0b3b2 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -1783,11 +1783,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(dev, "Unable to register iio device\n"); - goto err_trigger_unregister; + goto err_pm_cleanup; } return 0; +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(dev); + pm_runtime_disable(dev); err_trigger_unregister: bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1); err_buffer_cleanup: diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index 24c9387c2968..ba6c8ca488b1 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -1589,11 +1589,14 @@ static int kxcjk1013_probe(struct i2c_client *client, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(&client->dev, "unable to register iio device\n"); - goto err_buffer_cleanup; + goto err_pm_cleanup; } return 0; +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(&client->dev); + pm_runtime_disable(&client->dev); err_buffer_cleanup: iio_triggered_buffer_cleanup(indio_dev); err_trigger_unregister: diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c index 4c359fb05480..c53a3398b14c 100644 --- a/drivers/iio/accel/mma9551.c +++ b/drivers/iio/accel/mma9551.c @@ -495,11 +495,14 @@ static int mma9551_probe(struct i2c_client *client, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(&client->dev, "unable to register iio device\n"); - goto out_poweroff; + goto err_pm_cleanup; } return 0; +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(&client->dev); + pm_runtime_disable(&client->dev); out_poweroff: mma9551_set_device_state(client, false); diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c index ba3ecb3b57dc..1599b75724d4 100644 --- a/drivers/iio/accel/mma9553.c +++ b/drivers/iio/accel/mma9553.c @@ -1134,12 +1134,15 @@ static int mma9553_probe(struct i2c_client *client, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(&client->dev, "unable to register iio device\n"); - goto out_poweroff; + goto err_pm_cleanup; } dev_dbg(&indio_dev->dev, "Registered device %s\n", name); return 0; +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(&client->dev); + pm_runtime_disable(&client->dev); out_poweroff: mma9551_set_device_state(client, false); return ret; diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index 17b939a367ad..81a6d09788bd 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c @@ -1188,11 +1188,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(dev, "unable to register iio device\n"); - goto err_buffer_cleanup; + goto err_pm_cleanup; } return 0; +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(dev); + pm_runtime_disable(dev); err_buffer_cleanup: iio_triggered_buffer_cleanup(indio_dev); err_trigger_unregister: diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c index 1dabfd615dab..f89724481df9 100644 --- a/drivers/iio/imu/kmx61.c +++ b/drivers/iio/imu/kmx61.c @@ -1385,7 +1385,7 @@ static int kmx61_probe(struct i2c_client *client, ret = iio_device_register(data->acc_indio_dev); if (ret < 0) { dev_err(&client->dev, "Failed to register acc iio device\n"); - goto err_buffer_cleanup_mag; + goto err_pm_cleanup; } ret = iio_device_register(data->mag_indio_dev); @@ -1398,6 +1398,9 @@ static int kmx61_probe(struct i2c_client *client, err_iio_unregister_acc: iio_device_unregister(data->acc_indio_dev); +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(&client->dev); + pm_runtime_disable(&client->dev); err_buffer_cleanup_mag: if (client->irq > 0) iio_triggered_buffer_cleanup(data->mag_indio_dev); diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c index f96f53175349..3d4d21f979fa 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -962,13 +962,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(dev, "unable to register iio device\n"); - goto err_disable_runtime_pm; + goto err_pm_cleanup; } dev_dbg(dev, "Registered device %s\n", name); return 0; -err_disable_runtime_pm: +err_pm_cleanup: + pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); err_buffer_cleanup: iio_triggered_buffer_cleanup(indio_dev); -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] iio: Fix error handling for PM 2022-01-06 11:23 ` [PATCH v2] iio: Fix error handling for PM Miaoqian Lin @ 2022-01-07 11:59 ` Andy Shevchenko 2022-01-30 14:51 ` Jonathan Cameron 0 siblings, 1 reply; 7+ messages in thread From: Andy Shevchenko @ 2022-01-07 11:59 UTC (permalink / raw) To: Miaoqian Lin Cc: adi.reus, ardeleanalex, gwendal, jic23, lars, linus.walleij, linux-iio, linux-kernel, stephan On Thu, Jan 06, 2022 at 11:23:09AM +0000, Miaoqian Lin wrote: > The pm_runtime_enable will increase power disable depth. > If the probe fails, we should use pm_runtime_disable() to balance > pm_runtime_enable(). In the PM Runtime docs: > Drivers in ->remove() callback should undo the runtime PM changes done > in ->probe(). Usually this means calling pm_runtime_disable(), > pm_runtime_dont_use_autosuspend() etc. > We should do this in error handling. > > Fix this problem for the following drivers: bmc150, bmg160, kmx61, > kxcj-1013, mma9551, mma9553. LGTM, FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Fixes: 7d0ead5c3f00 ("iio: Reconcile operation order between iio_register/unregister and pm functions") > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > --- > Changes in v2: > - fix the fixes tag > - fix similar problems introduced by the same commit > --- > drivers/iio/accel/bmc150-accel-core.c | 5 ++++- > drivers/iio/accel/kxcjk-1013.c | 5 ++++- > drivers/iio/accel/mma9551.c | 5 ++++- > drivers/iio/accel/mma9553.c | 5 ++++- > drivers/iio/gyro/bmg160_core.c | 5 ++++- > drivers/iio/imu/kmx61.c | 5 ++++- > drivers/iio/magnetometer/bmc150_magn.c | 5 +++-- > 7 files changed, 27 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c > index b0678c351e82..c3a2b4c0b3b2 100644 > --- a/drivers/iio/accel/bmc150-accel-core.c > +++ b/drivers/iio/accel/bmc150-accel-core.c > @@ -1783,11 +1783,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(dev, "Unable to register iio device\n"); > - goto err_trigger_unregister; > + goto err_pm_cleanup; > } > > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > err_trigger_unregister: > bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1); > err_buffer_cleanup: > diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c > index 24c9387c2968..ba6c8ca488b1 100644 > --- a/drivers/iio/accel/kxcjk-1013.c > +++ b/drivers/iio/accel/kxcjk-1013.c > @@ -1589,11 +1589,14 @@ static int kxcjk1013_probe(struct i2c_client *client, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(&client->dev, "unable to register iio device\n"); > - goto err_buffer_cleanup; > + goto err_pm_cleanup; > } > > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(&client->dev); > + pm_runtime_disable(&client->dev); > err_buffer_cleanup: > iio_triggered_buffer_cleanup(indio_dev); > err_trigger_unregister: > diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c > index 4c359fb05480..c53a3398b14c 100644 > --- a/drivers/iio/accel/mma9551.c > +++ b/drivers/iio/accel/mma9551.c > @@ -495,11 +495,14 @@ static int mma9551_probe(struct i2c_client *client, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(&client->dev, "unable to register iio device\n"); > - goto out_poweroff; > + goto err_pm_cleanup; > } > > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(&client->dev); > + pm_runtime_disable(&client->dev); > out_poweroff: > mma9551_set_device_state(client, false); > > diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c > index ba3ecb3b57dc..1599b75724d4 100644 > --- a/drivers/iio/accel/mma9553.c > +++ b/drivers/iio/accel/mma9553.c > @@ -1134,12 +1134,15 @@ static int mma9553_probe(struct i2c_client *client, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(&client->dev, "unable to register iio device\n"); > - goto out_poweroff; > + goto err_pm_cleanup; > } > > dev_dbg(&indio_dev->dev, "Registered device %s\n", name); > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(&client->dev); > + pm_runtime_disable(&client->dev); > out_poweroff: > mma9551_set_device_state(client, false); > return ret; > diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c > index 17b939a367ad..81a6d09788bd 100644 > --- a/drivers/iio/gyro/bmg160_core.c > +++ b/drivers/iio/gyro/bmg160_core.c > @@ -1188,11 +1188,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(dev, "unable to register iio device\n"); > - goto err_buffer_cleanup; > + goto err_pm_cleanup; > } > > return 0; > > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(dev); > + pm_runtime_disable(dev); > err_buffer_cleanup: > iio_triggered_buffer_cleanup(indio_dev); > err_trigger_unregister: > diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c > index 1dabfd615dab..f89724481df9 100644 > --- a/drivers/iio/imu/kmx61.c > +++ b/drivers/iio/imu/kmx61.c > @@ -1385,7 +1385,7 @@ static int kmx61_probe(struct i2c_client *client, > ret = iio_device_register(data->acc_indio_dev); > if (ret < 0) { > dev_err(&client->dev, "Failed to register acc iio device\n"); > - goto err_buffer_cleanup_mag; > + goto err_pm_cleanup; > } > > ret = iio_device_register(data->mag_indio_dev); > @@ -1398,6 +1398,9 @@ static int kmx61_probe(struct i2c_client *client, > > err_iio_unregister_acc: > iio_device_unregister(data->acc_indio_dev); > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(&client->dev); > + pm_runtime_disable(&client->dev); > err_buffer_cleanup_mag: > if (client->irq > 0) > iio_triggered_buffer_cleanup(data->mag_indio_dev); > diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c > index f96f53175349..3d4d21f979fa 100644 > --- a/drivers/iio/magnetometer/bmc150_magn.c > +++ b/drivers/iio/magnetometer/bmc150_magn.c > @@ -962,13 +962,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap, > ret = iio_device_register(indio_dev); > if (ret < 0) { > dev_err(dev, "unable to register iio device\n"); > - goto err_disable_runtime_pm; > + goto err_pm_cleanup; > } > > dev_dbg(dev, "Registered device %s\n", name); > return 0; > > -err_disable_runtime_pm: > +err_pm_cleanup: > + pm_runtime_dont_use_autosuspend(dev); > pm_runtime_disable(dev); > err_buffer_cleanup: > iio_triggered_buffer_cleanup(indio_dev); > -- > 2.17.1 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2] iio: Fix error handling for PM 2022-01-07 11:59 ` Andy Shevchenko @ 2022-01-30 14:51 ` Jonathan Cameron 0 siblings, 0 replies; 7+ messages in thread From: Jonathan Cameron @ 2022-01-30 14:51 UTC (permalink / raw) To: Andy Shevchenko Cc: Miaoqian Lin, adi.reus, ardeleanalex, gwendal, lars, linus.walleij, linux-iio, linux-kernel, stephan On Fri, 7 Jan 2022 13:59:47 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > On Thu, Jan 06, 2022 at 11:23:09AM +0000, Miaoqian Lin wrote: > > The pm_runtime_enable will increase power disable depth. > > If the probe fails, we should use pm_runtime_disable() to balance > > pm_runtime_enable(). In the PM Runtime docs: > > Drivers in ->remove() callback should undo the runtime PM changes done > > in ->probe(). Usually this means calling pm_runtime_disable(), > > pm_runtime_dont_use_autosuspend() etc. > > We should do this in error handling. > > > > Fix this problem for the following drivers: bmc150, bmg160, kmx61, > > kxcj-1013, mma9551, mma9553. > > LGTM, FWIW, > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied to the fixes-togreg branch of iio.git and marked for stable. Thanks, Jonathan > > > Fixes: 7d0ead5c3f00 ("iio: Reconcile operation order between iio_register/unregister and pm functions") > > Signed-off-by: Miaoqian Lin <linmq006@gmail.com> > > --- > > Changes in v2: > > - fix the fixes tag > > - fix similar problems introduced by the same commit > > --- > > drivers/iio/accel/bmc150-accel-core.c | 5 ++++- > > drivers/iio/accel/kxcjk-1013.c | 5 ++++- > > drivers/iio/accel/mma9551.c | 5 ++++- > > drivers/iio/accel/mma9553.c | 5 ++++- > > drivers/iio/gyro/bmg160_core.c | 5 ++++- > > drivers/iio/imu/kmx61.c | 5 ++++- > > drivers/iio/magnetometer/bmc150_magn.c | 5 +++-- > > 7 files changed, 27 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c > > index b0678c351e82..c3a2b4c0b3b2 100644 > > --- a/drivers/iio/accel/bmc150-accel-core.c > > +++ b/drivers/iio/accel/bmc150-accel-core.c > > @@ -1783,11 +1783,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(dev, "Unable to register iio device\n"); > > - goto err_trigger_unregister; > > + goto err_pm_cleanup; > > } > > > > return 0; > > > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(dev); > > + pm_runtime_disable(dev); > > err_trigger_unregister: > > bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1); > > err_buffer_cleanup: > > diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c > > index 24c9387c2968..ba6c8ca488b1 100644 > > --- a/drivers/iio/accel/kxcjk-1013.c > > +++ b/drivers/iio/accel/kxcjk-1013.c > > @@ -1589,11 +1589,14 @@ static int kxcjk1013_probe(struct i2c_client *client, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(&client->dev, "unable to register iio device\n"); > > - goto err_buffer_cleanup; > > + goto err_pm_cleanup; > > } > > > > return 0; > > > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(&client->dev); > > + pm_runtime_disable(&client->dev); > > err_buffer_cleanup: > > iio_triggered_buffer_cleanup(indio_dev); > > err_trigger_unregister: > > diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c > > index 4c359fb05480..c53a3398b14c 100644 > > --- a/drivers/iio/accel/mma9551.c > > +++ b/drivers/iio/accel/mma9551.c > > @@ -495,11 +495,14 @@ static int mma9551_probe(struct i2c_client *client, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(&client->dev, "unable to register iio device\n"); > > - goto out_poweroff; > > + goto err_pm_cleanup; > > } > > > > return 0; > > > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(&client->dev); > > + pm_runtime_disable(&client->dev); > > out_poweroff: > > mma9551_set_device_state(client, false); > > > > diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c > > index ba3ecb3b57dc..1599b75724d4 100644 > > --- a/drivers/iio/accel/mma9553.c > > +++ b/drivers/iio/accel/mma9553.c > > @@ -1134,12 +1134,15 @@ static int mma9553_probe(struct i2c_client *client, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(&client->dev, "unable to register iio device\n"); > > - goto out_poweroff; > > + goto err_pm_cleanup; > > } > > > > dev_dbg(&indio_dev->dev, "Registered device %s\n", name); > > return 0; > > > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(&client->dev); > > + pm_runtime_disable(&client->dev); > > out_poweroff: > > mma9551_set_device_state(client, false); > > return ret; > > diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c > > index 17b939a367ad..81a6d09788bd 100644 > > --- a/drivers/iio/gyro/bmg160_core.c > > +++ b/drivers/iio/gyro/bmg160_core.c > > @@ -1188,11 +1188,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(dev, "unable to register iio device\n"); > > - goto err_buffer_cleanup; > > + goto err_pm_cleanup; > > } > > > > return 0; > > > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(dev); > > + pm_runtime_disable(dev); > > err_buffer_cleanup: > > iio_triggered_buffer_cleanup(indio_dev); > > err_trigger_unregister: > > diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c > > index 1dabfd615dab..f89724481df9 100644 > > --- a/drivers/iio/imu/kmx61.c > > +++ b/drivers/iio/imu/kmx61.c > > @@ -1385,7 +1385,7 @@ static int kmx61_probe(struct i2c_client *client, > > ret = iio_device_register(data->acc_indio_dev); > > if (ret < 0) { > > dev_err(&client->dev, "Failed to register acc iio device\n"); > > - goto err_buffer_cleanup_mag; > > + goto err_pm_cleanup; > > } > > > > ret = iio_device_register(data->mag_indio_dev); > > @@ -1398,6 +1398,9 @@ static int kmx61_probe(struct i2c_client *client, > > > > err_iio_unregister_acc: > > iio_device_unregister(data->acc_indio_dev); > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(&client->dev); > > + pm_runtime_disable(&client->dev); > > err_buffer_cleanup_mag: > > if (client->irq > 0) > > iio_triggered_buffer_cleanup(data->mag_indio_dev); > > diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c > > index f96f53175349..3d4d21f979fa 100644 > > --- a/drivers/iio/magnetometer/bmc150_magn.c > > +++ b/drivers/iio/magnetometer/bmc150_magn.c > > @@ -962,13 +962,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap, > > ret = iio_device_register(indio_dev); > > if (ret < 0) { > > dev_err(dev, "unable to register iio device\n"); > > - goto err_disable_runtime_pm; > > + goto err_pm_cleanup; > > } > > > > dev_dbg(dev, "Registered device %s\n", name); > > return 0; > > > > -err_disable_runtime_pm: > > +err_pm_cleanup: > > + pm_runtime_dont_use_autosuspend(dev); > > pm_runtime_disable(dev); > > err_buffer_cleanup: > > iio_triggered_buffer_cleanup(indio_dev); > > -- > > 2.17.1 > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-30 14:46 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-05 12:56 [PATCH] iio: gyro: bmg160: Fix error handling in bmg160_core_probe Miaoqian Lin 2022-01-05 13:07 ` Jonathan Cameron 2022-01-05 13:52 ` Andy Shevchenko 2022-01-05 13:54 ` Andy Shevchenko 2022-01-06 11:23 ` [PATCH v2] iio: Fix error handling for PM Miaoqian Lin 2022-01-07 11:59 ` Andy Shevchenko 2022-01-30 14:51 ` Jonathan Cameron
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.