| Message ID | 71ef51037525ae6324bc22e933c00a514d518b31.1550671256.git.hns@goldelico.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio mount matrix - revitalize missing bindings documentation and provide code for bmc150, bmg160, bma180, itg3200, hmc584x | expand |
On Wed, Feb 20, 2019 at 03:00:50PM +0100, H. Nikolaus Schaller wrote: > This patch allows to read a mount-matrix device tree > property and report to user-space or in-kernel iio > clients. > +static const struct iio_mount_matrix * > +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, > + const struct iio_chan_spec *chan) > +{ > + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; It's hard to read. Can you split such lines in your series to something like struct bmc150_accel_data *data = iio_priv(indio_dev); return &data->orientation; ? > +} > + > +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { > + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), > + { }, Terminator lines better without comma. > +};
> Am 20.02.2019 um 17:07 schrieb Andy Shevchenko <andriy.shevchenko@linux.intel.com>: > > On Wed, Feb 20, 2019 at 03:00:50PM +0100, H. Nikolaus Schaller wrote: >> This patch allows to read a mount-matrix device tree >> property and report to user-space or in-kernel iio >> clients. > >> +static const struct iio_mount_matrix * >> +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, >> + const struct iio_chan_spec *chan) >> +{ >> + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; > > It's hard to read. > > Can you split such lines in your series to something like > > struct bmc150_accel_data *data = iio_priv(indio_dev); > > return &data->orientation; > > ? I think I did copy it verbatim from some other iio driver: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/drivers/iio/magnetometer/ak8975.c?h=next-20190220#n745 and checkpatch did not complain. But yes, it can and should be improved since it seems that I picked the only bad example as template... > >> +} >> + >> +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { >> + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), >> + { }, > > Terminator lines better without comma. Ok. > >> +}; > > -- > With Best Regards, > Andy Shevchenko > >
On Wed, 20 Feb 2019 15:00:50 +0100 "H. Nikolaus Schaller" <hns@goldelico.com> wrote: > This patch allows to read a mount-matrix device tree > property and report to user-space or in-kernel iio > clients. > > Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> This will clash with Andy's current patch, but I'll fix that up if needed. Otherwise, one trivial suggestion inline. Jonathan > --- > drivers/iio/accel/bmc150-accel-core.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c > index 383c802eb5b8..9178846cfddc 100644 > --- a/drivers/iio/accel/bmc150-accel-core.c > +++ b/drivers/iio/accel/bmc150-accel-core.c > @@ -204,6 +204,7 @@ struct bmc150_accel_data { > int ev_enable_state; > int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */ > const struct bmc150_accel_chip_info *chip_info; > + struct iio_mount_matrix orientation; > }; > > static const struct { > @@ -796,6 +797,18 @@ static ssize_t bmc150_accel_get_fifo_state(struct device *dev, > return sprintf(buf, "%d\n", state); > } > > +static const struct iio_mount_matrix * > +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, > + const struct iio_chan_spec *chan) > +{ > + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; I would use a local variable as that casting is less than simple to parse to my eyes anyway! > +} > + > +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { > + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), > + { }, > +}; > + > static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); > static IIO_CONST_ATTR(hwfifo_watermark_max, > __stringify(BMC150_ACCEL_FIFO_LENGTH)); > @@ -978,6 +991,7 @@ static const struct iio_event_spec bmc150_accel_event = { > .shift = 16 - (bits), \ > .endianness = IIO_LE, \ > }, \ > + .ext_info = bmc150_accel_ext_info, \ > .event_spec = &bmc150_accel_event, \ > .num_event_specs = 1 \ > } > @@ -1555,6 +1569,11 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, > > data->regmap = regmap; > > + ret = of_iio_read_mount_matrix(dev, "mount-matrix", > + &data->orientation); > + if (ret) > + return ret; > + > ret = bmc150_accel_chip_init(data); > if (ret < 0) > return ret;
> Am 20.02.2019 um 17:14 schrieb Jonathan Cameron <jic23@kernel.org>: > > On Wed, 20 Feb 2019 15:00:50 +0100 > "H. Nikolaus Schaller" <hns@goldelico.com> wrote: > >> This patch allows to read a mount-matrix device tree >> property and report to user-space or in-kernel iio >> clients. >> >> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> > This will clash with Andy's current patch, but I'll fix that up if > needed. Otherwise, one trivial suggestion inline. Ok, thanks! > > Jonathan > >> --- >> drivers/iio/accel/bmc150-accel-core.c | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c >> index 383c802eb5b8..9178846cfddc 100644 >> --- a/drivers/iio/accel/bmc150-accel-core.c >> +++ b/drivers/iio/accel/bmc150-accel-core.c >> @@ -204,6 +204,7 @@ struct bmc150_accel_data { >> int ev_enable_state; >> int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */ >> const struct bmc150_accel_chip_info *chip_info; >> + struct iio_mount_matrix orientation; >> }; >> >> static const struct { >> @@ -796,6 +797,18 @@ static ssize_t bmc150_accel_get_fifo_state(struct device *dev, >> return sprintf(buf, "%d\n", state); >> } >> >> +static const struct iio_mount_matrix * >> +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, >> + const struct iio_chan_spec *chan) >> +{ >> + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; > > I would use a local variable as that casting is less than simple to parse > to my eyes anyway! Yes, Andy already suggested that. I just happend to pick one of the only two bad examples from all iio drivers as template... drivers/iio/imu/inv_mpu6050/inv_mpu_core.c drivers/iio/magnetometer/ak8975.c > >> +} >> + >> +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { >> + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), >> + { }, >> +}; >> + >> static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); >> static IIO_CONST_ATTR(hwfifo_watermark_max, >> __stringify(BMC150_ACCEL_FIFO_LENGTH)); >> @@ -978,6 +991,7 @@ static const struct iio_event_spec bmc150_accel_event = { >> .shift = 16 - (bits), \ >> .endianness = IIO_LE, \ >> }, \ >> + .ext_info = bmc150_accel_ext_info, \ >> .event_spec = &bmc150_accel_event, \ >> .num_event_specs = 1 \ >> } >> @@ -1555,6 +1569,11 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, >> >> data->regmap = regmap; >> >> + ret = of_iio_read_mount_matrix(dev, "mount-matrix", >> + &data->orientation); >> + if (ret) >> + return ret; >> + >> ret = bmc150_accel_chip_init(data); >> if (ret < 0) >> return ret; > BR and thanks, Nikolaus
On Wed, 20 Feb 2019 17:20:29 +0100 "H. Nikolaus Schaller" <hns@goldelico.com> wrote: > > Am 20.02.2019 um 17:14 schrieb Jonathan Cameron <jic23@kernel.org>: > > > > On Wed, 20 Feb 2019 15:00:50 +0100 > > "H. Nikolaus Schaller" <hns@goldelico.com> wrote: > > > >> This patch allows to read a mount-matrix device tree > >> property and report to user-space or in-kernel iio > >> clients. > >> > >> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> > > This will clash with Andy's current patch, but I'll fix that up if > > needed. Otherwise, one trivial suggestion inline. > > Ok, thanks! > > > > > Jonathan > > > >> --- > >> drivers/iio/accel/bmc150-accel-core.c | 19 +++++++++++++++++++ > >> 1 file changed, 19 insertions(+) > >> > >> diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c > >> index 383c802eb5b8..9178846cfddc 100644 > >> --- a/drivers/iio/accel/bmc150-accel-core.c > >> +++ b/drivers/iio/accel/bmc150-accel-core.c > >> @@ -204,6 +204,7 @@ struct bmc150_accel_data { > >> int ev_enable_state; > >> int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */ > >> const struct bmc150_accel_chip_info *chip_info; > >> + struct iio_mount_matrix orientation; > >> }; > >> > >> static const struct { > >> @@ -796,6 +797,18 @@ static ssize_t bmc150_accel_get_fifo_state(struct device *dev, > >> return sprintf(buf, "%d\n", state); > >> } > >> > >> +static const struct iio_mount_matrix * > >> +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, > >> + const struct iio_chan_spec *chan) > >> +{ > >> + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; > > > > I would use a local variable as that casting is less than simple to parse > > to my eyes anyway! > > Yes, Andy already suggested that. I just happend to pick one of the only two bad examples > from all iio drivers as template... > > drivers/iio/imu/inv_mpu6050/inv_mpu_core.c > drivers/iio/magnetometer/ak8975.c If you like, feel free to send patches to tidy those up as well! Then no one else can be unlucky on the same thing in future. Jonathan > > > > >> +} > >> + > >> +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { > >> + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), > >> + { }, > >> +}; > >> + > >> static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); > >> static IIO_CONST_ATTR(hwfifo_watermark_max, > >> __stringify(BMC150_ACCEL_FIFO_LENGTH)); > >> @@ -978,6 +991,7 @@ static const struct iio_event_spec bmc150_accel_event = { > >> .shift = 16 - (bits), \ > >> .endianness = IIO_LE, \ > >> }, \ > >> + .ext_info = bmc150_accel_ext_info, \ > >> .event_spec = &bmc150_accel_event, \ > >> .num_event_specs = 1 \ > >> } > >> @@ -1555,6 +1569,11 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, > >> > >> data->regmap = regmap; > >> > >> + ret = of_iio_read_mount_matrix(dev, "mount-matrix", > >> + &data->orientation); > >> + if (ret) > >> + return ret; > >> + > >> ret = bmc150_accel_chip_init(data); > >> if (ret < 0) > >> return ret; > > > > BR and thanks, > Nikolaus >
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c index 383c802eb5b8..9178846cfddc 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -204,6 +204,7 @@ struct bmc150_accel_data { int ev_enable_state; int64_t timestamp, old_timestamp; /* Only used in hw fifo mode. */ const struct bmc150_accel_chip_info *chip_info; + struct iio_mount_matrix orientation; }; static const struct { @@ -796,6 +797,18 @@ static ssize_t bmc150_accel_get_fifo_state(struct device *dev, return sprintf(buf, "%d\n", state); } +static const struct iio_mount_matrix * +bmc150_accel_get_mount_matrix(const struct iio_dev *indio_dev, + const struct iio_chan_spec *chan) +{ + return &((struct bmc150_accel_data *)iio_priv(indio_dev))->orientation; +} + +static const struct iio_chan_spec_ext_info bmc150_accel_ext_info[] = { + IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, bmc150_accel_get_mount_matrix), + { }, +}; + static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); static IIO_CONST_ATTR(hwfifo_watermark_max, __stringify(BMC150_ACCEL_FIFO_LENGTH)); @@ -978,6 +991,7 @@ static const struct iio_event_spec bmc150_accel_event = { .shift = 16 - (bits), \ .endianness = IIO_LE, \ }, \ + .ext_info = bmc150_accel_ext_info, \ .event_spec = &bmc150_accel_event, \ .num_event_specs = 1 \ } @@ -1555,6 +1569,11 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq, data->regmap = regmap; + ret = of_iio_read_mount_matrix(dev, "mount-matrix", + &data->orientation); + if (ret) + return ret; + ret = bmc150_accel_chip_init(data); if (ret < 0) return ret;
This patch allows to read a mount-matrix device tree property and report to user-space or in-kernel iio clients. Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> --- drivers/iio/accel/bmc150-accel-core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)