Message ID | 20181026004512.31012-6-matheus.bernardino@usp.br (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | staging:iio:ad2s90: Add scale info and improve error handling | expand |
On Thu, Oct 25, 2018 at 09:45:11PM -0300, Matheus Tavares wrote: > From: Victor Colombo <victorcolombo@gmail.com> > > This patch adds the IIO_CHAN_INFO_SCALE mask to ad2s90_chan and > implements the relative read behavior at ad2s90_read_raw. > > Signed-off-by: Victor Colombo <victorcolombo@gmail.com> > --- You should be adding your S-o-B here as well because the patch is passing through your hands. regards, dan carpenter
On Fri, Oct 26, 2018 at 7:04 AM Dan Carpenter <dan.carpenter@oracle.com> wrote: > > On Thu, Oct 25, 2018 at 09:45:11PM -0300, Matheus Tavares wrote: > > From: Victor Colombo <victorcolombo@gmail.com> > > > > This patch adds the IIO_CHAN_INFO_SCALE mask to ad2s90_chan and > > implements the relative read behavior at ad2s90_read_raw. > > > > Signed-off-by: Victor Colombo <victorcolombo@gmail.com> > > --- > > You should be adding your S-o-B here as well because the patch is > passing through your hands. Thanks for the review! I'll be sending a v2 with my S-o-B there. > regards, > dan carpenter > > -- > You received this message because you are subscribed to the Google Groups "Kernel USP" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kernel-usp+unsubscribe@googlegroups.com. > To post to this group, send email to kernel-usp@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kernel-usp/20181026100422.lvz2avowd6ddix54%40mwanda. > For more options, visit https://groups.google.com/d/optout.
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c index b4a6a89c11b0..52b656875ed1 100644 --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@ -34,19 +34,31 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev, int ret; struct ad2s90_state *st = iio_priv(indio_dev); - mutex_lock(&st->lock); + switch (m) { + case IIO_CHAN_INFO_SCALE: + /* 2 * Pi / (2^12 - 1) ~= 0.001534355 */ + *val = 0; + *val2 = 1534355; + return IIO_VAL_INT_PLUS_NANO; + case IIO_CHAN_INFO_RAW: + mutex_lock(&st->lock); + + ret = spi_read(st->sdev, st->rx, 2); + if (ret < 0) { + mutex_unlock(&st->lock); + return ret; + } + + *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); - ret = spi_read(st->sdev, st->rx, 2); - if (ret < 0) { mutex_unlock(&st->lock); - return ret; - } - *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); - - mutex_unlock(&st->lock); + return IIO_VAL_INT; + default: + break; + } - return IIO_VAL_INT; + return -EINVAL; } static const struct iio_info ad2s90_info = { @@ -57,7 +69,7 @@ static const struct iio_chan_spec ad2s90_chan = { .type = IIO_ANGL, .indexed = 1, .channel = 0, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), }; static int ad2s90_probe(struct spi_device *spi)