From: Jonathan Cameron <jic23@kernel.org>
To: Hartmut Knaack <knaack.h@gmx.de>, IIO <linux-iio@vger.kernel.org>
Cc: David Barksdale <dbarksdale@uplogix.com>
Subject: Re: [PATCH]iio:humidity:si7020: cleanup read_raw and probe
Date: Sat, 25 Oct 2014 20:41:02 +0100 [thread overview]
Message-ID: <544BFCCE.7000308@kernel.org> (raw)
In-Reply-To: <544BE747.80403@gmx.de>
On 25/10/14 19:09, Hartmut Knaack wrote:
> When reading temperature or humidity values, a shift of two bits to the right
> needs to be applied, and only for the humidity channel a mask of the lower
> 12 bits needs to be applied. This reduces code repetition.
> During probe, i2c_set_clientdata() was used, although its counterpart was not,
> so drop it.
>
> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Applied to the togreg branch of iio.git, initially pushed out as testing.
Thanks for the cleanup.
J
> ---
> diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c
> index 62d74d3..b541646 100644
> --- a/drivers/iio/humidity/si7020.c
> +++ b/drivers/iio/humidity/si7020.c
> @@ -56,10 +56,9 @@ static int si7020_read_raw(struct iio_dev *indio_dev,
> SI7020CMD_RH_HOLD);
> if (ret < 0)
> return ret;
> - if (chan->type == IIO_TEMP)
> - *val = ret >> 2;
> - else
> - *val = (ret & 0x3FFF) >> 2;
> + *val = ret >> 2;
> + if (chan->type == IIO_HUMIDITYRELATIVE)
> + *val &= GENMASK(11, 0);
> return IIO_VAL_INT;
> case IIO_CHAN_INFO_SCALE:
> if (chan->type == IIO_TEMP)
> @@ -133,7 +132,6 @@ static int si7020_probe(struct i2c_client *client,
>
> data = iio_priv(indio_dev);
> *data = client;
> - i2c_set_clientdata(client, indio_dev);
>
> indio_dev->dev.parent = &client->dev;
> indio_dev->name = dev_name(&client->dev);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2014-10-25 19:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 18:09 [PATCH]iio:humidity:si7020: cleanup read_raw and probe Hartmut Knaack
2014-10-25 19:41 ` Jonathan Cameron [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-18 19:46 Hartmut Knaack
2014-10-25 10:02 ` Jonathan Cameron
2014-10-25 17:34 ` Hartmut Knaack
2014-10-25 19:34 ` Jonathan Cameron
2014-10-25 19:37 ` 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=544BFCCE.7000308@kernel.org \
--to=jic23@kernel.org \
--cc=dbarksdale@uplogix.com \
--cc=knaack.h@gmx.de \
--cc=linux-iio@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox