From: Jonathan Cameron <jic23@kernel.org>
To: Matheus Tavares <matheus.bernardino@usp.br>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Hartmut Knaack <knaack.h@gmx.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-iio@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com,
Victor Colombo <victorcolombo@gmail.com>
Subject: Re: [PATCH v3 5/6] staging:iio:ad2s90: Add IIO_CHAN_INFO_SCALE to channel spec and read_raw
Date: Sun, 4 Nov 2018 16:48:57 +0000 [thread overview]
Message-ID: <20181104164857.119019f3@archlinux> (raw)
In-Reply-To: <20181103224948.31014-6-matheus.bernardino@usp.br>
On Sat, 3 Nov 2018 19:49:47 -0300
Matheus Tavares <matheus.bernardino@usp.br> wrote:
> 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>
> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Hi Matheus,
Somewhere in the process, the authorship of this patch changed from
Victor to you (From:). Given the sign off order I've assumed this
was be accident and put it back to Victor.
For reference
git commit --amend --author="Victor Colombo <victorcolombo@gmail.com>"
Whilst the patch was modified a fair bit, the fact you have left Victor
as the first sign-off implies you think it is still substantially
Victor's patch (I agree with that).
Anyhow, shout if you disagree as still time to change it before
I push this tree out as non rebasing (probably later this week).
Whilst things are only visible in testing I can change anything,
but once I push out as togreg, I am committing to that being a stable
platform for others to base their code on so can't fix things like this.
Applied.
Thanks,
Jonathan
> ---
> drivers/staging/iio/resolver/ad2s90.c | 30 +++++++++++++++++++--------
> 1 file changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
> index 8f79cccf4814..9c168b7410d0 100644
> --- a/drivers/staging/iio/resolver/ad2s90.c
> +++ b/drivers/staging/iio/resolver/ad2s90.c
> @@ -34,17 +34,29 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev,
> int ret;
> struct ad2s90_state *st = iio_priv(indio_dev);
>
> - mutex_lock(&st->lock);
> - ret = spi_read(st->sdev, st->rx, 2);
> - if (ret < 0) {
> + switch (m) {
> + case IIO_CHAN_INFO_SCALE:
> + /* 2 * Pi / 2^12 */
> + *val = 6283; /* mV */
> + *val2 = 12;
> + return IIO_VAL_FRACTIONAL_LOG2;
> + 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);
> +
> 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 = {
> @@ -55,7 +67,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)
next prev parent reply other threads:[~2018-11-05 2:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-03 22:49 [PATCH v3 0/6] staging:iio:ad2s90: Add scale info and improve error handling Matheus Tavares
2018-11-03 22:49 ` [PATCH v3 1/6] staging:iio:ad2s90: Make read_raw return spi_read's error code Matheus Tavares
2018-11-04 16:36 ` Jonathan Cameron
2018-11-03 22:49 ` [PATCH v3 2/6] staging:iio:ad2s90: Make probe handle spi_setup failure Matheus Tavares
2018-11-04 16:38 ` Jonathan Cameron
2018-11-03 22:49 ` [PATCH v3 3/6] staging:iio:ad2s90: Remove always overwritten assignment Matheus Tavares
2018-11-04 16:39 ` Jonathan Cameron
2018-11-03 22:49 ` [PATCH v3 4/6] staging:iio:ad2s90: Move device registration to the end of probe Matheus Tavares
2018-11-04 16:42 ` Jonathan Cameron
2018-11-03 22:49 ` [PATCH v3 5/6] staging:iio:ad2s90: Add IIO_CHAN_INFO_SCALE to channel spec and read_raw Matheus Tavares
2018-11-04 16:48 ` Jonathan Cameron [this message]
2018-11-03 22:49 ` [PATCH v3 6/6] staging:iio:ad2s90: Check channel type at read_raw Matheus Tavares
2018-11-04 16:51 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181104164857.119019f3@archlinux \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-usp@googlegroups.com \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
--cc=pmeerw@pmeerw.net \
--cc=victorcolombo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.