iio: st_sensors: Call st_sensors_power_enable() from bus drivers

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>

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index a1bd7e3..5c258c1 100644 (file)
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -1260,13 +1260,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;
@@ -1275,10 +1271,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,
@@ -1293,11 +1287,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,
@@ -1320,9 +1314,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);
@@ -1331,8 +1322,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 360e16f..95e305b 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 568ff1b..83d3308 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 e000504..ee3f0ea 100644 (file)
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -471,13 +471,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;
@@ -490,11 +486,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,
@@ -517,9 +513,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);
@@ -528,8 +521,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 8190966..a25cc03 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 efb8627..18d6a2a 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 55357f2..58da484 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -501,13 +501,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;
@@ -521,11 +517,11 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
 
        err = st_sensors_init_sensor(indio_dev, pdata);
        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,
@@ -548,9 +544,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);
@@ -559,8 +552,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 36f4e7b..3e23c11 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -82,16 +82,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 0e2323d..03c0a73 100644 (file)
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -76,16 +76,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 789a292..7912b5a 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 09c6903..f0a5af3 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 b5ee3ec..b48cf7d 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;
 }