On Sun, 5 Apr 2020 13:07:24 +0100
Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
> On Sun, 5 Apr 2020 12:36:26 +0200
> Lorenzo Bianconi <lorenzo@xxxxxxxxxx> wrote:
>
> > Remove ST_LSM6DSX_REG_WHOAMI_ADDR duplicated macro and rely on ST sensor
> > common definitions
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
> Applied.
Actually no. I'd rather duplicate the value than have this
largerly unconnected driver include that header with lots of other
stuff in it.
So dropped.
Thanks,
Jonathan
>
> Thanks,
>
> Jonathan
>
> > ---
> > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 5 ++---
> > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > index 84d219ae6aee..f3cf13b29d18 100644
> > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> > @@ -58,12 +58,11 @@
> > #include <linux/regmap.h>
> > #include <linux/bitfield.h>
> >
> > +#include <linux/iio/common/st_sensors.h>
> > #include <linux/platform_data/st_sensors_pdata.h>
> >
> > #include "st_lsm6dsx.h"
> >
> > -#define ST_LSM6DSX_REG_WHOAMI_ADDR 0x0f
> > -
> > #define ST_LSM6DSX_TS_SENSITIVITY 25000UL /* 25us */
> >
> > static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
> > @@ -1364,7 +1363,7 @@ static int st_lsm6dsx_check_whoami(struct st_lsm6dsx_hw *hw, int id,
> > return -ENODEV;
> > }
> >
> > - err = regmap_read(hw->regmap, ST_LSM6DSX_REG_WHOAMI_ADDR, &data);
> > + err = regmap_read(hw->regmap, ST_SENSORS_DEFAULT_WAI_ADDRESS, &data);
> > if (err < 0) {
> > dev_err(hw->dev, "failed to read whoami register\n");
> > return err;
>
