projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
staging, iio, mpu: repack mpu driver's communicate interface
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
iio
/
imu
/
inv_mpu
/
inv_slave_bma250.c
diff --git
a/drivers/staging/iio/imu/inv_mpu/inv_slave_bma250.c
b/drivers/staging/iio/imu/inv_mpu/inv_slave_bma250.c
index bd84f637af527b7cc9e9ebe0614e37c88bc858e1..1452f9c0b5d117cfed63d4224c94445704278ad5 100644
(file)
--- a/
drivers/staging/iio/imu/inv_mpu/inv_slave_bma250.c
+++ b/
drivers/staging/iio/imu/inv_mpu/inv_slave_bma250.c
@@
-127,7
+127,7
@@
static int bma250_set_bandwidth(struct inv_mpu_iio_s *st, u8 bw)
return res;
data &= BMA250_BW_REG_MASK;
data |= bandwidth;
return res;
data &= BMA250_BW_REG_MASK;
data |= bandwidth;
- res = inv_secondary_write(BMA250_BW_SEL_REG, data);
+ res = inv_secondary_write(
st,
BMA250_BW_SEL_REG, data);
return res;
}
return res;
}
@@
-156,7
+156,7
@@
static int bma250_set_range(struct inv_mpu_iio_s *st, u8 range)
return res;
orig &= BMA250_RANGE_MASK;
data |= orig;
return res;
orig &= BMA250_RANGE_MASK;
data |= orig;
- res = inv_secondary_write(BMA250_RANGE_SEL_REG, data);
+ res = inv_secondary_write(
st,
BMA250_RANGE_SEL_REG, data);
if (res)
return res;
bma_static_property.range = range;
if (res)
return res;
bma_static_property.range = range;
@@
-182,7
+182,7
@@
static int setup_slave_bma250(struct inv_mpu_iio_s *st)
return result;
/*AUX(accel), slave address is set inside set_3050_bypass*/
/* bma250 x axis LSB register address is 2 */
return result;
/*AUX(accel), slave address is set inside set_3050_bypass*/
/* bma250 x axis LSB register address is 2 */
- result = inv_
i2c
_single_write(st, REG_3050_AUX_BST_ADDR,
+ result = inv_
plat
_single_write(st, REG_3050_AUX_BST_ADDR,
BMA250_X_AXIS_LSB_REG);
return result;
BMA250_X_AXIS_LSB_REG);
return result;
@@
-209,7
+209,7
@@
static int bma250_set_mode(struct inv_mpu_iio_s *st, u8 mode)
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- res = inv_secondary_write(BMA250_MODE_CTRL_REG, data);
+ res = inv_secondary_write(
st,
BMA250_MODE_CTRL_REG, data);
if (res)
return res;
bma_static_property.mode = mode;
if (res)
return res;
bma_static_property.mode = mode;