Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux...

[cascardo/linux.git] / drivers / iio / imu / inv_mpu6050 / inv_mpu_trigger.c

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
index 844610c..e8818d4 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
@@ -19,19 +19,19 @@ static void inv_scan_query(struct iio_dev *indio_dev)
 
        st->chip_config.gyro_fifo_enable =
                test_bit(INV_MPU6050_SCAN_GYRO_X,
-                       indio_dev->active_scan_mask) ||
-                       test_bit(INV_MPU6050_SCAN_GYRO_Y,
-                       indio_dev->active_scan_mask) ||
-                       test_bit(INV_MPU6050_SCAN_GYRO_Z,
-                       indio_dev->active_scan_mask);
+                        indio_dev->active_scan_mask) ||
+               test_bit(INV_MPU6050_SCAN_GYRO_Y,
+                        indio_dev->active_scan_mask) ||
+               test_bit(INV_MPU6050_SCAN_GYRO_Z,
+                        indio_dev->active_scan_mask);
 
        st->chip_config.accl_fifo_enable =
                test_bit(INV_MPU6050_SCAN_ACCL_X,
-                       indio_dev->active_scan_mask) ||
-                       test_bit(INV_MPU6050_SCAN_ACCL_Y,
-                       indio_dev->active_scan_mask) ||
-                       test_bit(INV_MPU6050_SCAN_ACCL_Z,
-                       indio_dev->active_scan_mask);
+                        indio_dev->active_scan_mask) ||
+               test_bit(INV_MPU6050_SCAN_ACCL_Y,
+                        indio_dev->active_scan_mask) ||
+               test_bit(INV_MPU6050_SCAN_ACCL_Z,
+                        indio_dev->active_scan_mask);
 }
 
 /**
@@ -65,15 +65,15 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable)
                if (result)
                        return result;
        } else {
-               result = inv_mpu6050_write_reg(st, st->reg->fifo_en, 0);
+               result = regmap_write(st->map, st->reg->fifo_en, 0);
                if (result)
                        return result;
 
-               result = inv_mpu6050_write_reg(st, st->reg->int_enable, 0);
+               result = regmap_write(st->map, st->reg->int_enable, 0);
                if (result)
                        return result;
 
-               result = inv_mpu6050_write_reg(st, st->reg->user_ctrl, 0);
+               result = regmap_write(st->map, st->reg->user_ctrl, 0);
                if (result)
                        return result;
 
@@ -101,7 +101,7 @@ static int inv_mpu6050_set_enable(struct iio_dev *indio_dev, bool enable)
  * @state: Desired trigger state
  */
 static int inv_mpu_data_rdy_trigger_set_state(struct iio_trigger *trig,
-                                               bool state)
+                                             bool state)
 {
        return inv_mpu6050_set_enable(iio_trigger_get_drvdata(trig), state);
 }
@@ -123,7 +123,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
        if (!st->trig)
                return -ENOMEM;
 
-       ret = devm_request_irq(&indio_dev->dev, st->client->irq,
+       ret = devm_request_irq(&indio_dev->dev, st->irq,
                               &iio_trigger_generic_data_rdy_poll,
                               IRQF_TRIGGER_RISING,
                               "inv_mpu",
@@ -131,7 +131,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
        if (ret)
                return ret;
 
-       st->trig->dev.parent = &st->client->dev;
+       st->trig->dev.parent = regmap_get_device(st->map);
        st->trig->ops = &inv_mpu_trigger_ops;
        iio_trigger_set_drvdata(st->trig, indio_dev);