iio: imu: inv_mpu6050: set power on/off only once during all init

This way there is no need anymore to export the power function to
i2c and spi modules.
Bus setup is done inside init when power is on and the result is
now checked.

Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index c4db9086775ce1ceda49eba0b475450e4ece45e4..0b06d6aa646908a79b37fc31587b8270ec611868 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -301,7 +301,6 @@ int inv_mpu6050_set_power_itg(struct inv_mpu6050_state *st, bool power_on)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(inv_mpu6050_set_power_itg);
 
 static int inv_mpu6050_set_gyro_fsr(struct inv_mpu6050_state *st,
                                    enum inv_mpu6050_fsr_e val)
@@ -371,27 +370,23 @@ static int inv_mpu6050_init_config(struct iio_dev *indio_dev)
        u8 d;
        struct inv_mpu6050_state *st = iio_priv(indio_dev);
 
-       result = inv_mpu6050_set_power_itg(st, true);
-       if (result)
-               return result;
-
        result = inv_mpu6050_set_gyro_fsr(st, INV_MPU6050_FSR_2000DPS);
        if (result)
-               goto error_power_off;
+               return result;
 
        result = inv_mpu6050_set_lpf_regs(st, INV_MPU6050_FILTER_20HZ);
        if (result)
-               goto error_power_off;
+               return result;
 
        d = INV_MPU6050_FIFO_RATE_TO_DIVIDER(INV_MPU6050_INIT_FIFO_RATE);
        result = regmap_write(st->map, st->reg->sample_rate_div, d);
        if (result)
-               goto error_power_off;
+               return result;
 
        d = (INV_MPU6050_FS_02G << INV_MPU6050_ACCL_CONFIG_FSR_SHIFT);
        result = regmap_write(st->map, st->reg->accl_config, d);
        if (result)
-               goto error_power_off;
+               return result;
 
        result = regmap_write(st->map, st->reg->int_pin_cfg, st->irq_mask);
        if (result)
@@ -410,13 +405,9 @@ static int inv_mpu6050_init_config(struct iio_dev *indio_dev)
        /* magn chip init, noop if not present in the chip */
        result = inv_mpu_magn_probe(st);
        if (result)
-               goto error_power_off;
-
-       return inv_mpu6050_set_power_itg(st, false);
+               return result;
 
-error_power_off:
-       inv_mpu6050_set_power_itg(st, false);
-       return result;
+       return 0;
 }
 
 static int inv_mpu6050_sensor_set(struct inv_mpu6050_state  *st, int reg,
@@ -1176,7 +1167,7 @@ static int inv_check_and_setup_chip(struct inv_mpu6050_state *st)
        if (result)
                goto error_power_off;
 
-       return inv_mpu6050_set_power_itg(st, false);
+       return 0;
 
 error_power_off:
        inv_mpu6050_set_power_itg(st, false);
@@ -1341,7 +1332,7 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
        result = inv_mpu6050_init_config(indio_dev);
        if (result) {
                dev_err(dev, "Could not initialize device.\n");
-               return result;
+               goto error_power_off;
        }
 
        dev_set_drvdata(dev, indio_dev);
@@ -1353,8 +1344,16 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
                indio_dev->name = dev_name(dev);
 
        /* requires parent device set in indio_dev */
-       if (inv_mpu_bus_setup)
-               inv_mpu_bus_setup(indio_dev);
+       if (inv_mpu_bus_setup) {
+               result = inv_mpu_bus_setup(indio_dev);
+               if (result)
+                       goto error_power_off;
+       }
+
+       /* chip init is done, turning off */
+       result = inv_mpu6050_set_power_itg(st, false);
+       if (result)
+               return result;
 
        switch (chip_type) {
        case INV_MPU9150:
@@ -1413,6 +1412,10 @@ int inv_mpu_core_probe(struct regmap *regmap, int irq, const char *name,
        }
 
        return 0;
+
+error_power_off:
+       inv_mpu6050_set_power_itg(st, false);
+       return result;
 }
 EXPORT_SYMBOL_GPL(inv_mpu_core_probe);
 

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 24df880248f2014c3bf16f246028f6d3fc72d0fc..6993d3b87bb0f718fb2c962986cd2eb381f5aead 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -78,22 +78,13 @@ static int inv_mpu_i2c_aux_setup(struct iio_dev *indio_dev)
 
        /* enable i2c bypass when using i2c auxiliary bus */
        if (inv_mpu_i2c_aux_bus(dev)) {
-               ret = inv_mpu6050_set_power_itg(st, true);
-               if (ret)
-                       return ret;
                ret = regmap_write(st->map, st->reg->int_pin_cfg,
                                   st->irq_mask | INV_MPU6050_BIT_BYPASS_EN);
                if (ret)
-                       goto error;
-               ret = inv_mpu6050_set_power_itg(st, false);
-               if (ret)
-                       goto error;
+                       return ret;
        }
 
        return 0;
-error:
-       inv_mpu6050_set_power_itg(st, false);
-       return ret;
 }
 
 /**

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
index bc351dd58c5329d537e222ec1248c09a4a243a58..673b198e6368fa6e5e0b59ae4d76e0c1b233367f 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
@@ -21,10 +21,6 @@ static int inv_mpu_i2c_disable(struct iio_dev *indio_dev)
        struct inv_mpu6050_state *st = iio_priv(indio_dev);
        int ret = 0;
 
-       ret = inv_mpu6050_set_power_itg(st, true);
-       if (ret)
-               return ret;
-
        if (st->reg->i2c_if) {
                ret = regmap_write(st->map, st->reg->i2c_if,
                                   INV_ICM20602_BIT_I2C_IF_DIS);
@@ -33,12 +29,8 @@ static int inv_mpu_i2c_disable(struct iio_dev *indio_dev)
                ret = regmap_write(st->map, st->reg->user_ctrl,
                                   st->chip_config.user_ctrl);
        }
-       if (ret) {
-               inv_mpu6050_set_power_itg(st, false);
-               return ret;
-       }
 
-       return inv_mpu6050_set_power_itg(st, false);
+       return ret;
 }
 
 static int inv_mpu_probe(struct spi_device *spi)