]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: imu: inv_icm42600: Simplify pm_runtime setup
authorSean Nyekjaer <sean@geanix.com>
Mon, 20 Oct 2025 13:05:03 +0000 (09:05 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:01:23 +0000 (14:01 +0100)
[ Upstream commit 0792c1984a45ccd7a296d6b8cb78088bc99a212e ]

Rework the power management in inv_icm42600_core_probe() to use
devm_pm_runtime_set_active_enabled(), which simplifies the runtime PM
setup by handling activation and enabling in one step.
Remove the separate inv_icm42600_disable_pm callback, as it's no longer
needed with the devm-managed approach.
Using devm_pm_runtime_enable() also fixes the missing disable of
autosuspend.
Update inv_icm42600_disable_vddio_reg() to only disable the regulator if
the device is not suspended i.e. powered-down, preventing unbalanced
disables.
Also remove redundant error msg on regulator_disable(), the regulator
framework already emits an error message when regulator_disable() fails.

This simplifies the PM setup and avoids manipulating the usage counter
unnecessarily.

Fixes: 31c24c1e93c3 ("iio: imu: inv_icm42600: add core of new inv_icm42600 driver")
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Link: https://patch.msgid.link/20250901-icm42pmreg-v3-1-ef1336246960@geanix.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c

index f77935acb48a00192df6e51e720e93e6427bd113..8787dae64ff7fc86b78dc41b44ebc29a7f95e15c 100644 (file)
@@ -550,20 +550,12 @@ static void inv_icm42600_disable_vdd_reg(void *_data)
 static void inv_icm42600_disable_vddio_reg(void *_data)
 {
        struct inv_icm42600_state *st = _data;
-       const struct device *dev = regmap_get_device(st->map);
-       int ret;
-
-       ret = regulator_disable(st->vddio_supply);
-       if (ret)
-               dev_err(dev, "failed to disable vddio error %d\n", ret);
-}
+       struct device *dev = regmap_get_device(st->map);
 
-static void inv_icm42600_disable_pm(void *_data)
-{
-       struct device *dev = _data;
+       if (pm_runtime_status_suspended(dev))
+               return;
 
-       pm_runtime_put_sync(dev);
-       pm_runtime_disable(dev);
+       regulator_disable(st->vddio_supply);
 }
 
 int inv_icm42600_core_probe(struct regmap *regmap, int chip, int irq,
@@ -660,16 +652,14 @@ int inv_icm42600_core_probe(struct regmap *regmap, int chip, int irq,
                return ret;
 
        /* setup runtime power management */
-       ret = pm_runtime_set_active(dev);
+       ret = devm_pm_runtime_set_active_enabled(dev);
        if (ret)
                return ret;
-       pm_runtime_get_noresume(dev);
-       pm_runtime_enable(dev);
+
        pm_runtime_set_autosuspend_delay(dev, INV_ICM42600_SUSPEND_DELAY_MS);
        pm_runtime_use_autosuspend(dev);
-       pm_runtime_put(dev);
 
-       return devm_add_action_or_reset(dev, inv_icm42600_disable_pm, dev);
+       return ret;
 }
 EXPORT_SYMBOL_GPL(inv_icm42600_core_probe);