iio: st_sensors: Call st_sensors_power_enable() from bus drivers

[ Upstream commit 7db4f2cacbede1c6d95552c0d10e77398665a733 ]

In case we would initialize two IIO devices from one physical device,
we shouldn't have a clash on regulators. That's why move
st_sensors_power_enable() call from core to bus drivers.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210414195454.84183-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 43c50167d220cecb17ea201dd0295bd3a1973fdd..bde0ca3ef7a4c82c32e49ef4029161753d46b168 100644 (file)
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -1255,13 +1255,9 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &accel_info;
 
-       err = st_sensors_power_enable(indio_dev);
-       if (err)
-               return err;
-
        err = st_sensors_verify_id(indio_dev);
        if (err < 0)
-               goto st_accel_power_off;
+               return err;
 
        adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
        indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
@@ -1270,10 +1266,8 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
        channels = devm_kmemdup(&indio_dev->dev,
                                adata->sensor_settings->ch,
                                channels_size, GFP_KERNEL);
-       if (!channels) {
-               err = -ENOMEM;
-               goto st_accel_power_off;
-       }
+       if (!channels)
+               return -ENOMEM;
 
        if (apply_acpi_orientation(indio_dev, channels))
                dev_warn(&indio_dev->dev,
@@ -1288,11 +1282,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
 
        err = st_sensors_init_sensor(indio_dev, pdata);
        if (err < 0)
-               goto st_accel_power_off;
+               return err;
 
        err = st_accel_allocate_ring(indio_dev);
        if (err < 0)
-               goto st_accel_power_off;
+               return err;
 
        if (adata->irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
@@ -1315,9 +1309,6 @@ st_accel_device_register_error:
                st_sensors_deallocate_trigger(indio_dev);
 st_accel_probe_trigger_error:
        st_accel_deallocate_ring(indio_dev);
-st_accel_power_off:
-       st_sensors_power_disable(indio_dev);
-
        return err;
 }
 EXPORT_SYMBOL(st_accel_common_probe);
@@ -1326,8 +1317,6 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
 {
        struct st_sensor_data *adata = iio_priv(indio_dev);
 
-       st_sensors_power_disable(indio_dev);
-
        iio_device_unregister(indio_dev);
        if (adata->irq > 0)
                st_sensors_deallocate_trigger(indio_dev);

diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 360e16f2cadb9669d482d2c0c54ab384bf9ae848..95e305b88d5edb4b4c22326cdcafec08ab39da08 100644 (file)
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -174,16 +174,29 @@ static int st_accel_i2c_probe(struct i2c_client *client)
        if (ret < 0)
                return ret;
 
+       ret = st_sensors_power_enable(indio_dev);
+       if (ret)
+               return ret;
+
        ret = st_accel_common_probe(indio_dev);
        if (ret < 0)
-               return ret;
+               goto st_accel_power_off;
 
        return 0;
+
+st_accel_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return ret;
 }
 
 static int st_accel_i2c_remove(struct i2c_client *client)
 {
-       st_accel_common_remove(i2c_get_clientdata(client));
+       struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_accel_common_remove(indio_dev);
 
        return 0;
 }

diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 568ff1bae0eee679f761dcc3e5f1e802da9ef74d..83d3308ce5ccc395e61f3ee89d6b8d3924928473 100644 (file)
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -123,16 +123,29 @@ static int st_accel_spi_probe(struct spi_device *spi)
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_accel_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_accel_power_off;
 
        return 0;
+
+st_accel_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_accel_spi_remove(struct spi_device *spi)
 {
-       st_accel_common_remove(spi_get_drvdata(spi));
+       struct iio_dev *indio_dev = spi_get_drvdata(spi);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_accel_common_remove(indio_dev);
 
        return 0;
 }

diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index c8aa051995d3bf6d4a8fb4301f6ae09ee4d4538b..8c87f85f20bd1f2187f67a1e4641de14f87bc9d9 100644 (file)
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -466,13 +466,9 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &gyro_info;
 
-       err = st_sensors_power_enable(indio_dev);
-       if (err)
-               return err;
-
        err = st_sensors_verify_id(indio_dev);
        if (err < 0)
-               goto st_gyro_power_off;
+               return err;
 
        gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
        indio_dev->channels = gdata->sensor_settings->ch;
@@ -485,11 +481,11 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
 
        err = st_sensors_init_sensor(indio_dev, pdata);
        if (err < 0)
-               goto st_gyro_power_off;
+               return err;
 
        err = st_gyro_allocate_ring(indio_dev);
        if (err < 0)
-               goto st_gyro_power_off;
+               return err;
 
        if (gdata->irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
@@ -512,9 +508,6 @@ st_gyro_device_register_error:
                st_sensors_deallocate_trigger(indio_dev);
 st_gyro_probe_trigger_error:
        st_gyro_deallocate_ring(indio_dev);
-st_gyro_power_off:
-       st_sensors_power_disable(indio_dev);
-
        return err;
 }
 EXPORT_SYMBOL(st_gyro_common_probe);
@@ -523,8 +516,6 @@ void st_gyro_common_remove(struct iio_dev *indio_dev)
 {
        struct st_sensor_data *gdata = iio_priv(indio_dev);
 
-       st_sensors_power_disable(indio_dev);
-
        iio_device_unregister(indio_dev);
        if (gdata->irq > 0)
                st_sensors_deallocate_trigger(indio_dev);

diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 8190966e6ff0aa77f24ef8ac1d5da2a0b24b1034..a25cc0379e16313cf24790cefcc6614f5b1f3974 100644 (file)
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -86,16 +86,29 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_gyro_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_gyro_power_off;
 
        return 0;
+
+st_gyro_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_gyro_i2c_remove(struct i2c_client *client)
 {
-       st_gyro_common_remove(i2c_get_clientdata(client));
+       struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_gyro_common_remove(indio_dev);
 
        return 0;
 }

diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index efb862763ca3d7b790de1b028e4b6243760ebd8f..18d6a2aeda45a6d0868d62f4f32dfdb05f9cf0c1 100644 (file)
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -90,16 +90,29 @@ static int st_gyro_spi_probe(struct spi_device *spi)
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_gyro_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_gyro_power_off;
 
        return 0;
+
+st_gyro_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_gyro_spi_remove(struct spi_device *spi)
 {
-       st_gyro_common_remove(spi_get_drvdata(spi));
+       struct iio_dev *indio_dev = spi_get_drvdata(spi);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_gyro_common_remove(indio_dev);
 
        return 0;
 }

diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 79de721e60159cdc6d7b1271e1abac2dd492364a..0fc38f17dbe049f5eb4ae8504b3ffea0440f097d 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -494,13 +494,9 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &magn_info;
 
-       err = st_sensors_power_enable(indio_dev);
-       if (err)
-               return err;
-
        err = st_sensors_verify_id(indio_dev);
        if (err < 0)
-               goto st_magn_power_off;
+               return err;
 
        mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
        indio_dev->channels = mdata->sensor_settings->ch;
@@ -511,11 +507,11 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
 
        err = st_sensors_init_sensor(indio_dev, NULL);
        if (err < 0)
-               goto st_magn_power_off;
+               return err;
 
        err = st_magn_allocate_ring(indio_dev);
        if (err < 0)
-               goto st_magn_power_off;
+               return err;
 
        if (mdata->irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
@@ -538,9 +534,6 @@ st_magn_device_register_error:
                st_sensors_deallocate_trigger(indio_dev);
 st_magn_probe_trigger_error:
        st_magn_deallocate_ring(indio_dev);
-st_magn_power_off:
-       st_sensors_power_disable(indio_dev);
-
        return err;
 }
 EXPORT_SYMBOL(st_magn_common_probe);
@@ -549,8 +542,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
 {
        struct st_sensor_data *mdata = iio_priv(indio_dev);
 
-       st_sensors_power_disable(indio_dev);
-
        iio_device_unregister(indio_dev);
        if (mdata->irq > 0)
                st_sensors_deallocate_trigger(indio_dev);

diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index c6bb4ce7759435be2af4454702259775d266a286..7a7ab27379fc1ff67b9682585355d016aa07a1ed 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -78,16 +78,28 @@ static int st_magn_i2c_probe(struct i2c_client *client,
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_magn_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_magn_power_off;
 
        return 0;
+
+st_magn_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_magn_i2c_remove(struct i2c_client *client)
 {
        struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+       st_sensors_power_disable(indio_dev);
+
        st_magn_common_remove(indio_dev);
 
        return 0;

diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index 3d08d74c367da58d9db3fcebd90a101225a39a19..ee352f083c020687d597e64c8f1e151409d6fd92 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -72,16 +72,28 @@ static int st_magn_spi_probe(struct spi_device *spi)
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_magn_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_magn_power_off;
 
        return 0;
+
+st_magn_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_magn_spi_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+
+       st_sensors_power_disable(indio_dev);
+
        st_magn_common_remove(indio_dev);
 
        return 0;

diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 789a2928504a729c73dd1f2d26a06756909cd7ef..7912b5a6839555ed8e7bca80e7776bb126f46699 100644 (file)
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -689,13 +689,9 @@ int st_press_common_probe(struct iio_dev *indio_dev)
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &press_info;
 
-       err = st_sensors_power_enable(indio_dev);
-       if (err)
-               return err;
-
        err = st_sensors_verify_id(indio_dev);
        if (err < 0)
-               goto st_press_power_off;
+               return err;
 
        /*
         * Skip timestamping channel while declaring available channels to
@@ -718,11 +714,11 @@ int st_press_common_probe(struct iio_dev *indio_dev)
 
        err = st_sensors_init_sensor(indio_dev, pdata);
        if (err < 0)
-               goto st_press_power_off;
+               return err;
 
        err = st_press_allocate_ring(indio_dev);
        if (err < 0)
-               goto st_press_power_off;
+               return err;
 
        if (press_data->irq > 0) {
                err = st_sensors_allocate_trigger(indio_dev,
@@ -745,9 +741,6 @@ st_press_device_register_error:
                st_sensors_deallocate_trigger(indio_dev);
 st_press_probe_trigger_error:
        st_press_deallocate_ring(indio_dev);
-st_press_power_off:
-       st_sensors_power_disable(indio_dev);
-
        return err;
 }
 EXPORT_SYMBOL(st_press_common_probe);
@@ -756,8 +749,6 @@ void st_press_common_remove(struct iio_dev *indio_dev)
 {
        struct st_sensor_data *press_data = iio_priv(indio_dev);
 
-       st_sensors_power_disable(indio_dev);
-
        iio_device_unregister(indio_dev);
        if (press_data->irq > 0)
                st_sensors_deallocate_trigger(indio_dev);

diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 09c6903f99b872111296ff7f3c5bc88bc314149a..f0a5af314ceb8e49bb7485220ec895c7ebd9f656 100644 (file)
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -98,16 +98,29 @@ static int st_press_i2c_probe(struct i2c_client *client,
        if (ret < 0)
                return ret;
 
+       ret = st_sensors_power_enable(indio_dev);
+       if (ret)
+               return ret;
+
        ret = st_press_common_probe(indio_dev);
        if (ret < 0)
-               return ret;
+               goto st_press_power_off;
 
        return 0;
+
+st_press_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return ret;
 }
 
 static int st_press_i2c_remove(struct i2c_client *client)
 {
-       st_press_common_remove(i2c_get_clientdata(client));
+       struct iio_dev *indio_dev = i2c_get_clientdata(client);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_press_common_remove(indio_dev);
 
        return 0;
 }

diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index b5ee3ec2764ff0b4dd19ecb0ea2807d986ab63fa..b48cf7d01cd74bef16f603ba4ea618d27b3750ba 100644 (file)
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -82,16 +82,29 @@ static int st_press_spi_probe(struct spi_device *spi)
        if (err < 0)
                return err;
 
+       err = st_sensors_power_enable(indio_dev);
+       if (err)
+               return err;
+
        err = st_press_common_probe(indio_dev);
        if (err < 0)
-               return err;
+               goto st_press_power_off;
 
        return 0;
+
+st_press_power_off:
+       st_sensors_power_disable(indio_dev);
+
+       return err;
 }
 
 static int st_press_spi_remove(struct spi_device *spi)
 {
-       st_press_common_remove(spi_get_drvdata(spi));
+       struct iio_dev *indio_dev = spi_get_drvdata(spi);
+
+       st_sensors_power_disable(indio_dev);
+
+       st_press_common_remove(indio_dev);
 
        return 0;
 }