summaryrefslogtreecommitdiffstats
path: root/drivers/iio/pressure/st_pressure_i2c.c
diff options
context:
space:
mode:
authorAlexandru Ardelean <aardelean@deviqon.com>2021-08-23 13:22:02 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2021-09-14 13:00:31 +0200
commit5363c6c17b1014f696bf0b2984af4b694062ce8f (patch)
tree5d7d2fee4cf5b10a9251c4c7ae39aac7ed1a8dcd /drivers/iio/pressure/st_pressure_i2c.c
parentiio: st_sensors: remove st_sensors_deallocate_trigger() function (diff)
downloadlinux-5363c6c17b1014f696bf0b2984af4b694062ce8f.tar.xz
linux-5363c6c17b1014f696bf0b2984af4b694062ce8f.zip
iio: st_sensors: remove st_sensors_power_disable() function
This change converts the st_sensors_power_enable() function to use devm_add_action_or_reset() handlers to register regulator_disable hooks for when the drivers get unloaded. The parent device of the IIO device object is used. This is based on the assumption that all other devm_ calls in the ST sensors use this reference. This makes the st_sensors_power_disable() un-needed. Removing this also changes unload order a bit, as all ST drivers would call st_sensors_power_disable() first and iio_device_unregister() after that. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20210823112204.243255-4-aardelean@deviqon.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/pressure/st_pressure_i2c.c')
-rw-r--r--drivers/iio/pressure/st_pressure_i2c.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 6215de677017..afeeab485c0d 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -103,16 +103,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
if (ret)
return ret;
- ret = st_press_common_probe(indio_dev);
- if (ret < 0)
- goto st_press_power_off;
-
- return 0;
-
-st_press_power_off:
- st_sensors_power_disable(indio_dev);
-
- return ret;
+ return st_press_common_probe(indio_dev);
}
static int st_press_i2c_remove(struct i2c_client *client)
@@ -121,8 +112,6 @@ static int st_press_i2c_remove(struct i2c_client *client)
st_press_common_remove(indio_dev);
- st_sensors_power_disable(indio_dev);
-
return 0;
}