Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / iio / imu / inv_mpu6050 / inv_mpu_core.c

diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
index f0e06093b5e8db3ce4f9fe89f983a01efba316a0..0852b7fa777e91924642221fc5488a722bb33048 100644 (file)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -727,8 +727,7 @@ static const struct iio_info mpu_info = {
 /**
  *  inv_check_and_setup_chip() - check and setup chip.
  */
-static int inv_check_and_setup_chip(struct inv_mpu6050_state *st,
-               const struct i2c_device_id *id)
+static int inv_check_and_setup_chip(struct inv_mpu6050_state *st)
 {
        int result;
 
@@ -795,7 +794,7 @@ static int inv_mpu_probe(struct i2c_client *client,
        if (pdata)
                st->plat_data = *pdata;
        /* power is turned on inside check chip type*/
-       result = inv_check_and_setup_chip(st, id);
+       result = inv_check_and_setup_chip(st);
        if (result)
                return result;